Skip to content

Separate server name #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions tls-client/HelloHttpsClient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,12 @@ const char *HelloHttpsClient::HTTP_HELLO_STR = "Hello world!";
const char *HelloHttpsClient::HTTP_OK_STR = "200 OK";

HelloHttpsClient::HelloHttpsClient(const char *in_server_name,
const char *in_server_addr,
const uint16_t in_server_port,
mbedtls_platform_context* in_platform_ctx) :
socket(),
server_name(in_server_name),
server_addr(in_server_addr),
server_port(in_server_port),
/* The platform context is passed just in case any crypto calls need it.
* Please refer to https://github.com/ARMmbed/mbedtls/issues/1200 for more
Expand Down Expand Up @@ -114,12 +116,12 @@ int HelloHttpsClient::run()
return ret;

/* Start a connection to the server */
if ((ret = socket.connect(server_name, server_port)) != NSAPI_ERROR_OK) {
if ((ret = socket.connect(server_addr, server_port)) != NSAPI_ERROR_OK) {
mbedtls_printf("socket.connect() returned %d\n", ret);
return ret;
}
mbedtls_printf("Successfully connected to %s at port %u\n",
server_name, server_port);
server_addr, server_port);

/* Start the TLS handshake */
mbedtls_printf("Starting the TLS handshake...\n");
Expand Down
10 changes: 9 additions & 1 deletion tls-client/HelloHttpsClient.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,14 @@ class HelloHttpsClient
* Construct an HelloHttpsClient instance
*
* \param[in] in_server_name
* The server host name
* \param[in] in_server_addr
* The server domain/IP address
* \param[in] in_server_port
* The server port
*/
HelloHttpsClient(const char *in_server_name,
const char *in_server_addr,
const uint16_t in_server_port,
mbedtls_platform_context* in_platform_ctx);

Expand Down Expand Up @@ -192,9 +195,14 @@ class HelloHttpsClient
TCPSocket socket;

/**
* The domain/IP address of the server to contact
* The server host name to contact
*/
const char *server_name;

/**
* The domain/IP address of the server to contact
*/
const char *server_addr;
/**
* The port number to use in the connection
*/
Expand Down
4 changes: 3 additions & 1 deletion tls-client/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@

/* Domain/IP address of the server to contact */
const char SERVER_NAME[] = "os.mbed.com";
const char SERVER_ADDR[] = "os.mbed.com";

/* Port used to connect to the server */
const int SERVER_PORT = 443;
Expand Down Expand Up @@ -73,8 +74,9 @@ int main()
#endif /* MBEDTLS_MAJOR_VERSION */

/* Allocate a HTTPS client */
client = new (std::nothrow) HelloHttpsClient(SERVER_NAME, SERVER_PORT,
client = new (std::nothrow) HelloHttpsClient(SERVER_NAME, SERVER_ADDR, SERVER_PORT,
&platform_ctx);

if (client == NULL) {
mbedtls_printf("Failed to allocate HelloHttpsClient object\n"
"\nFAIL\n");
Expand Down