Author: mikej Date: Wed May 9 08:35:53 2007 New Revision: 5110 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/sofia-sip/stun_common.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun_common.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun_dns.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun_mini.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_stub_sigcomp.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_stub_stun.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_sctp.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c Log: a little bit of header file cleanup Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/sofia-sip/stun_common.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/sofia-sip/stun_common.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/sofia-sip/stun_common.h Wed May 9 08:35:53 2007 @@ -36,21 +36,8 @@ * */ -#include <stdio.h> -#include <string.h> -#include <stdlib.h> -#include <time.h> - -#ifdef WIN32 -#include <winsock2.h> -#else -#include <sys/socket.h> -#include <arpa/inet.h> -#endif - #include <sofia-sip/su_localinfo.h> - SOFIA_BEGIN_DECLS /* Define Message Types */ Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun_common.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun_common.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun_common.c Wed May 9 08:35:53 2007 @@ -43,6 +43,7 @@ #include "stun_internal.h" +#include <string.h> #include <assert.h> #if HAVE_FUNC Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun_dns.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun_dns.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun_dns.c Wed May 9 08:35:53 2007 @@ -54,6 +54,8 @@ #include "stun_internal.h" +#include <string.h> + struct stun_dns_lookup_s { su_home_t stun_home[1]; su_root_t *stun_root; Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun_mini.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun_mini.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun_mini.c Wed May 9 08:35:53 2007 @@ -39,6 +39,7 @@ #include "stun_internal.h" #include <assert.h> +#include <string.h> typedef struct stun_bound_s stun_bound_t; Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c Wed May 9 08:35:53 2007 @@ -964,6 +964,10 @@ if (tport_setname(self, tpn->tpn_proto, real_ai, tpn->tpn_canon) == -1) TPORT_CONNECT_ERROR(su_errno(), tport_setname); + /* Try to have a non-blocking connect(). + * The su_wait_create() below makes the socket non-blocking anyway. */ + su_setblocking(s, 0); + if (connect(s, ai->ai_addr, (socklen_t)(ai->ai_addrlen)) == SOCKET_ERROR) { err = su_errno(); if (!su_is_blocking(err)) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_stub_sigcomp.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_stub_sigcomp.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_stub_sigcomp.c Wed May 9 08:35:53 2007 @@ -33,6 +33,8 @@ #include "tport_internal.h" +#include <string.h> + tport_comp_vtable_t const *tport_comp_vtable = NULL; int tport_plug_in_compress(tport_comp_vtable_t const *vsc) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_stub_stun.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_stub_stun.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_stub_stun.c Wed May 9 08:35:53 2007 @@ -40,6 +40,7 @@ #include "sofia-sip/msg_addr.h" #include <assert.h> +#include <string.h> /* ---------------------------------------------------------------------- */ /* Plugin pointer */ Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_sctp.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_sctp.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_sctp.c Wed May 9 08:35:53 2007 @@ -50,6 +50,7 @@ #include <assert.h> #include <errno.h> #include <limits.h> +#include <string.h> /* ---------------------------------------------------------------------- */ /* SCTP */ Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c Wed May 9 08:35:53 2007 @@ -45,6 +45,7 @@ #include <assert.h> #include <errno.h> #include <limits.h> +#include <string.h> /* ---------------------------------------------------------------------- */ /* TLS */ Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c Wed May 9 08:35:53 2007 @@ -43,6 +43,7 @@ #endif #include <stdlib.h> +#include <string.h> #include <time.h> #include <assert.h> #include <errno.h>