cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-11-03 20:22:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add a server_adrr option to ssl_client2

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2014-02-25 11:11:26 +01:00
parent 5d917ff6a8
commit 0d8780b2cd
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
programs/ssl/ssl_client2.c
View File

@ -42,6 +42,7 @@
#endif #endif
#define DFL_SERVER_NAME "localhost" #define DFL_SERVER_NAME "localhost"
#define DFL_SERVER_ADDR NULL
#define DFL_SERVER_PORT 4433 #define DFL_SERVER_PORT 4433
#define DFL_REQUEST_PAGE "/" #define DFL_REQUEST_PAGE "/"
#define DFL_DEBUG_LEVEL 0 #define DFL_DEBUG_LEVEL 0
@ -83,6 +84,7 @@
struct options struct options
{ {
const char *server_name; /* hostname of the server (client only) */ const char *server_name; /* hostname of the server (client only) */
const char *server_addr; /* address of the server (client only) */
int server_port; /* port on which the ssl service runs */ int server_port; /* port on which the ssl service runs */
int debug_level; /* level of debugging */ int debug_level; /* level of debugging */
const char *request_page; /* page on server to request */ const char *request_page; /* page on server to request */
@ -215,6 +217,7 @@ static int my_verify( void *data, x509_crt *crt, int depth, int *flags )
"\n usage: ssl_client2 param=<>...\n" \ "\n usage: ssl_client2 param=<>...\n" \
"\n acceptable parameters:\n" \ "\n acceptable parameters:\n" \
" server_name=%%s default: localhost\n" \ " server_name=%%s default: localhost\n" \
" server_addr=%%s default: given by name\n" \
" server_port=%%d default: 4433\n" \ " server_port=%%d default: 4433\n" \
" request_page=%%s default: \".\"\n" \ " request_page=%%s default: \".\"\n" \
" debug_level=%%d default: 0 (disabled)\n" \ " debug_level=%%d default: 0 (disabled)\n" \
@ -315,6 +318,7 @@ int main( int argc, char *argv[] )
} }
opt.server_name = DFL_SERVER_NAME; opt.server_name = DFL_SERVER_NAME;
opt.server_addr = DFL_SERVER_ADDR;
opt.server_port = DFL_SERVER_PORT; opt.server_port = DFL_SERVER_PORT;
opt.debug_level = DFL_DEBUG_LEVEL; opt.debug_level = DFL_DEBUG_LEVEL;
opt.request_page = DFL_REQUEST_PAGE; opt.request_page = DFL_REQUEST_PAGE;
@ -346,6 +350,8 @@ int main( int argc, char *argv[] )
if( strcmp( p, "server_name" ) == 0 ) if( strcmp( p, "server_name" ) == 0 )
opt.server_name = q; opt.server_name = q;
else if( strcmp( p, "server_addr" ) == 0 )
opt.server_addr = q;
else if( strcmp( p, "server_port" ) == 0 ) else if( strcmp( p, "server_port" ) == 0 )
{ {
opt.server_port = atoi( q ); opt.server_port = atoi( q );
@ -682,11 +688,14 @@ int main( int argc, char *argv[] )
/* /*
* 2. Start the connection * 2. Start the connection
*/ */
printf( " . Connecting to tcp/%s/%-4d...", opt.server_name, if( opt.server_addr == NULL)
opt.server_addr = opt.server_name;
printf( " . Connecting to tcp/%s/%-4d...", opt.server_addr,
opt.server_port ); opt.server_port );
fflush( stdout ); fflush( stdout );
if( ( ret = net_connect( &server_fd, opt.server_name, if( ( ret = net_connect( &server_fd, opt.server_addr,
opt.server_port ) ) != 0 ) opt.server_port ) ) != 0 )
{ {
printf( " failed\n ! net_connect returned -0x%x\n\n", -ret ); printf( " failed\n ! net_connect returned -0x%x\n\n", -ret );