From d9e1d18fb69a859630bccbcac1a46f41a569a08c Mon Sep 17 00:00:00 2001 From: Giovanni Maruzzelli Date: Tue, 25 Aug 2009 03:34:23 +0000 Subject: [PATCH] skypiax: fixed problem with different storage between linux and windoz for tcp ports (int to unsigned short). Thanks Sergey for reporting git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14629 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/endpoints/mod_skypiax/skypiax.h | 4 ++++ src/mod/endpoints/mod_skypiax/skypiax_protocol.c | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/mod/endpoints/mod_skypiax/skypiax.h b/src/mod/endpoints/mod_skypiax/skypiax.h index 4ae29b0ce4..e045d2b600 100644 --- a/src/mod/endpoints/mod_skypiax/skypiax.h +++ b/src/mod/endpoints/mod_skypiax/skypiax.h @@ -288,4 +288,8 @@ int remote_party_is_ringing(private_t * tech_pvt); int remote_party_is_early_media(private_t * tech_pvt); int skypiax_answer(private_t * tech_pvt, char *id, char *value); int skypiax_transfer(private_t * tech_pvt, char *id, char *value); +#ifndef WIN32 int skypiax_socket_create_and_bind(private_t * tech_pvt, int *which_port); +#else +int skypiax_socket_create_and_bind(private_t * tech_pvt, unsigned short *which_port); +#endif //WIN32 \ No newline at end of file diff --git a/src/mod/endpoints/mod_skypiax/skypiax_protocol.c b/src/mod/endpoints/mod_skypiax/skypiax_protocol.c index e0298fe5a2..a09ff17791 100644 --- a/src/mod/endpoints/mod_skypiax/skypiax_protocol.c +++ b/src/mod/endpoints/mod_skypiax/skypiax_protocol.c @@ -25,12 +25,19 @@ XErrorHandler old_handler = 0; int xerror = 0; #endif /* WIN32 */ /*************************************/ - +#ifndef WIN32 int skypiax_socket_create_and_bind(private_t * tech_pvt, int *which_port) +#else +int skypiax_socket_create_and_bind(private_t * tech_pvt, unsigned short *which_port) +#endif //WIN32 { int s = -1; struct sockaddr_in my_addr; +#ifndef WIN32 int start_port = 6001; +#else +unsigned short start_port = 6001; +#endif //WIN32 memset(&my_addr, 0, sizeof(my_addr)); my_addr.sin_family = AF_INET;