December 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r6633 - freeswitch/trunk/src/include
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: mikej Date: Tue Dec 11 05:47:46 2007 New Revision: 6633 Modified: freeswitch/trunk/src/include/switch_utils.h Log: check to avoid potential seg Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Tue Dec 11 05:47:46 2007 @@ -216,6 +216,10 @@ char *p, *S = NULL, *Q = NULL; switch_bool_t tf = SWITCH_FALSE; + if (!s || !q) { + return SWITCH_FALSE; + } + if (strstr(s, q)) { return SWITCH_TRUE; }

1 0

[commit] r6632 - in freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua: bnf nta nth sresolv stun su su/sofia-sip tport
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: mikej Date: Tue Dec 11 05:45:05 2007 New Revision: 6632 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/bnf.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_client.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun_common.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun_mini.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/inet_ntop.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/inet_pton.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c Log: prepend su_ to inet_ntop and inet_pton replacement functions to work around problematic msvc 9 headers Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/bnf.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/bnf.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/bnf.c Tue Dec 11 05:45:05 2007 @@ -849,7 +849,7 @@ len = span_ip6_address(s); if (len) { - if (s[len] == '\0' && inet_pton(AF_INET6, s, addr) == 1) { + if (s[len] == '\0' && su_inet_pton(AF_INET6, s, addr) == 1) { if (SU_IN6_IS_ADDR_V4MAPPED(addr) || SU_IN6_IS_ADDR_V4COMPAT(addr)) { memcpy(addr, addr + 12, 4); @@ -868,7 +868,7 @@ s = memcpy(tmp, s, len + 1); scan_ip4_address(&tmp); } - if (s[len] == '\0' && inet_pton(AF_INET, s, addr) == 1) + if (s[len] == '\0' && su_inet_pton(AF_INET, s, addr) == 1) return (void)(*return_addrlen = 4), len; } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Tue Dec 11 05:45:05 2007 @@ -1795,7 +1795,7 @@ int port; if (su) { - inet_ntop(su->su_family, SU_ADDR(su), host, sizeof host); + su_inet_ntop(su->su_family, SU_ADDR(su), host, sizeof host); maddr = use_maddr && strcasecmp(canon, host) != 0; port = ntohs(su->su_port); } @@ -7524,7 +7524,7 @@ orq->orq_method_name, orq->orq_cseq->cs_seq, todo, su_strerror(error), error, tpn->tpn_proto, - inet_ntop(su->su_family, SU_ADDR(su), addr, sizeof(addr)), + su_inet_ntop(su->su_family, SU_ADDR(su), addr, sizeof(addr)), htons(su->su_port)); } @@ -9582,7 +9582,7 @@ aaaa->aaaa_record->r_type != sres_type_aaaa) continue; /* There was an error */ - inet_ntop(AF_INET6, &aaaa->aaaa_addr, addr, sizeof(addr)); + su_inet_ntop(AF_INET6, &aaaa->aaaa_addr, addr, sizeof(addr)); if (j == 0) SU_DEBUG_5(("nta(%p): %s IN AAAA %s\n", (void *)orq, @@ -9665,7 +9665,7 @@ a->a_record->r_type != sres_type_a) continue; /* There was an error */ - inet_ntop(AF_INET, &a->a_addr, addr, sizeof(addr)); + su_inet_ntop(AF_INET, &a->a_addr, addr, sizeof(addr)); if (j == 0) SU_DEBUG_5(("nta: %s IN A %s\n", a->a_record->r_name, addr)); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_client.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_client.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_client.c Tue Dec 11 05:45:05 2007 @@ -1075,7 +1075,7 @@ hc->hc_method_name, errmsg, error, tpn->tpn_proto, - inet_ntop(su->su_family, SU_ADDR(su), addr, sizeof(addr)), + su_inet_ntop(su->su_family, SU_ADDR(su), addr, sizeof(addr)), htons(su->su_port)); he->he_stats->st_tp_errors++; Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c Tue Dec 11 05:45:05 2007 @@ -166,10 +166,14 @@ #define SRES_TIME_MAX ((time_t)LONG_MAX) #if !HAVE_INET_PTON -int inet_pton(int af, char const *src, void *dst); +int su_inet_pton(int af, char const *src, void *dst); +#else +#define su_inet_pton inet_pton #endif #if !HAVE_INET_NTOP -const char *inet_ntop(int af, void const *src, char *dst, size_t size); +const char *su_inet_ntop(int af, void const *src, char *dst, size_t size); +#else +#define su_inet_ntop inet_ntop #endif #if defined(va_copy) @@ -2374,14 +2378,14 @@ if (strchr(server, ':')) { struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sa; memset(sa, 0, ns->ns_addrlen = sizeof *sin6); - err = inet_pton(sa->sa_family = AF_INET6, server, &sin6->sin6_addr); + err = su_inet_pton(sa->sa_family = AF_INET6, server, &sin6->sin6_addr); } else #endif { struct sockaddr_in *sin = (struct sockaddr_in *)sa; memset(sa, 0, ns->ns_addrlen = sizeof *sin); - err = inet_pton(sa->sa_family = AF_INET, server, &sin->sin_addr); + err = su_inet_pton(sa->sa_family = AF_INET, server, &sin->sin_addr); } if (err <= 0) { @@ -2469,7 +2473,7 @@ dns->dns_socket = INVALID_SOCKET; ns = c->c_nameservers[i]; memcpy(dns->dns_addr, ns->ns_addr, dns->dns_addrlen = ns->ns_addrlen); - inet_ntop(dns->dns_addr->ss_family, SS_ADDR(dns->dns_addr), + su_inet_ntop(dns->dns_addr->ss_family, SS_ADDR(dns->dns_addr), dns->dns_name, sizeof dns->dns_name); dns->dns_edns = c->c_opt.edns; servers[i] = dns++; @@ -2554,12 +2558,12 @@ if (family == AF_INET) { void *addr = &((struct sockaddr_in *)dns->dns_addr)->sin_addr; - inet_ntop(family, addr, ipaddr, sizeof ipaddr); + su_inet_ntop(family, addr, ipaddr, sizeof ipaddr); } #if HAVE_SIN6 else if (family == AF_INET6) { void *addr = &((struct sockaddr_in6 *)dns->dns_addr)->sin6_addr; - inet_ntop(family, addr, ipaddr, sizeof ipaddr); + su_inet_ntop(family, addr, ipaddr, sizeof ipaddr); lb = "[", rb = "]"; } #endif @@ -3168,7 +3172,7 @@ snprintf(info + strlen(info), sizeof(info) - strlen(info), " reported by "); - inet_ntop(from->ss_family, SS_ADDR(from), + su_inet_ntop(from->ss_family, SS_ADDR(from), info + strlen(info), sizeof(info) - strlen(info)); } @@ -3232,13 +3236,13 @@ if (remote->ss_family == AF_INET) { struct sockaddr_in const *sin = (struct sockaddr_in *)remote; uint8_t const *in_addr = (uint8_t*)&sin->sin_addr; - inet_ntop(AF_INET, in_addr, buf, sizeof(buf)); + su_inet_ntop(AF_INET, in_addr, buf, sizeof(buf)); } #if HAVE_SIN6 else if (remote->ss_family == AF_INET6) { struct sockaddr_in6 const *sin6 = (struct sockaddr_in6 *)remote; uint8_t const *in_addr = (uint8_t*)&sin6->sin6_addr; - inet_ntop(AF_INET6, in_addr, buf, sizeof(buf)); + su_inet_ntop(AF_INET6, in_addr, buf, sizeof(buf)); } #endif } @@ -3365,12 +3369,12 @@ ; else if (from->ss_family == AF_INET) { struct sockaddr_in const *sin = (void *)from; - inet_ntop(AF_INET, &sin->sin_addr, host, sizeof host); + su_inet_ntop(AF_INET, &sin->sin_addr, host, sizeof host); } #if HAVE_SIN6 else if (from->ss_family == AF_INET6) { struct sockaddr_in6 const *sin6 = (void *)from; - inet_ntop(AF_INET6, &sin6->sin6_addr, host, sizeof host); + su_inet_ntop(AF_INET6, &sin6->sin6_addr, host, sizeof host); } #endif Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun.c Tue Dec 11 05:45:05 2007 @@ -803,7 +803,7 @@ if ((err = bind(s, &su->su_sa, sulen)) < 0) { SU_DEBUG_3(("%s: bind(%s:%u): %s\n", __func__, - inet_ntop(su->su_family, SU_ADDR(su), addr, sizeof(addr)), + su_inet_ntop(su->su_family, SU_ADDR(su), addr, sizeof(addr)), (unsigned) ntohs(su->su_port), su_strerror(su_errno()))); return -1; @@ -817,7 +817,7 @@ memcpy(&sd->sd_bind_addr, su, sulen); SU_DEBUG_3(("%s: local socket is bound to %s:%u\n", __func__, - inet_ntop(su->su_family, SU_ADDR(su), addr, sizeof(addr)), + su_inet_ntop(su->su_family, SU_ADDR(su), addr, sizeof(addr)), (unsigned) ntohs(su->su_port))); events = SU_WAIT_IN | SU_WAIT_ERR; @@ -864,7 +864,7 @@ memcpy(su, li->li_addr, *return_len = li->li_addrlen); SU_DEBUG_3(("%s: using local address %s\n", __func__, - inet_ntop(family, SU_ADDR(su), addr, sizeof(addr)))); + su_inet_ntop(family, SU_ADDR(su), addr, sizeof(addr)))); break; } @@ -1693,7 +1693,7 @@ SU_DEBUG_5(("%s: response from server %s:%u\n", __func__, - inet_ntop(recv.su_family, SU_ADDR(&recv), addr, sizeof(addr)), + su_inet_ntop(recv.su_family, SU_ADDR(&recv), addr, sizeof(addr)), ntohs(recv.su_port))); debug_print(&binding_response.enc_buf); @@ -2014,7 +2014,7 @@ char addr[SU_ADDRSIZE]; SU_DEBUG_5(("%s: checking if %s is a local address.\n", __func__, - inet_ntop(AF_INET, SU_ADDR(su), addr, sizeof(addr)))); + su_inet_ntop(AF_INET, SU_ADDR(su), addr, sizeof(addr)))); hints->li_family = af = su->su_family; @@ -2032,7 +2032,7 @@ } SU_DEBUG_9(("%s: skipping local address %s.\n", __func__, - inet_ntop(af, SU_ADDR(li->li_addr), addr, sizeof(addr)))); + su_inet_ntop(af, SU_ADDR(li->li_addr), addr, sizeof(addr)))); } su_freelocalinfo(res); @@ -2758,7 +2758,7 @@ } SU_DEBUG_3(("%s: socket y bound to %s:%u\n", __func__, - inet_ntop(y_addr.su_family, SU_ADDR(&y_addr), addr, sizeof(addr)), + su_inet_ntop(y_addr.su_family, SU_ADDR(&y_addr), addr, sizeof(addr)), (unsigned) ntohs(y_addr.su_port))); req->sr_from_y = -1; @@ -2946,7 +2946,7 @@ req = stun_request_create(sd); SU_DEBUG_3(("%s: Starting to send STUN keepalives to %s:%u\n", __func__, - inet_ntop(sa->su_family, SU_ADDR(sa), addr, sizeof(addr)), + su_inet_ntop(sa->su_family, SU_ADDR(sa), addr, sizeof(addr)), (unsigned) ntohs(sa->su_port))); if (stun_make_binding_req(sh, req, req->sr_msg, 0, 0) < 0 || 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 Tue Dec 11 05:45:05 2007 @@ -223,7 +223,7 @@ memcpy(&addr->su_sin.sin_addr.s_addr, p + 4, 4); SU_DEBUG_5(("%s: address attribute: %s:%d\n", __func__, - inet_ntop(addr->su_family, SU_ADDR(addr), ipaddr, sizeof(ipaddr)), + su_inet_ntop(addr->su_family, SU_ADDR(addr), ipaddr, sizeof(ipaddr)), (unsigned) ntohs(addr->su_sin.sin_port))); attr->pattr = addr; @@ -640,7 +640,7 @@ } if (err > 0) { - inet_ntop(to_addr->su_family, SU_ADDR(to_addr), ipaddr, sizeof(ipaddr)); + su_inet_ntop(to_addr->su_family, SU_ADDR(to_addr), ipaddr, sizeof(ipaddr)); SU_DEBUG_5(("%s: message sent to %s:%u\n", __func__, ipaddr, ntohs(to_addr->su_port))); 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 Tue Dec 11 05:45:05 2007 @@ -184,7 +184,7 @@ struct sockaddr_in const *sin = from; if (sin->sin_family == AF_INET) - inet_ntop(sin->sin_family, &sin->sin_addr, buffer, sizeof buffer); + su_inet_ntop(sin->sin_family, &sin->sin_addr, buffer, sizeof buffer); else sprintf(buffer, "<af=%u>", (unsigned)sin->sin_family); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/inet_ntop.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/inet_ntop.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/inet_ntop.c Tue Dec 11 05:45:05 2007 @@ -45,7 +45,7 @@ * Paul Vixie, 1996. */ const char * -inet_ntop(int af, void const *src, char *dst, size_t size) +su_inet_ntop(int af, void const *src, char *dst, size_t size) { switch (af) { Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/inet_pton.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/inet_pton.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/inet_pton.c Tue Dec 11 05:45:05 2007 @@ -45,7 +45,7 @@ * Paul Vixie, 1996. */ int -inet_pton(int af, const char * src, void * dst) +su_inet_pton(int af, const char * src, void * dst) { switch (af) { case AF_INET: Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su.h Tue Dec 11 05:45:05 2007 @@ -321,8 +321,8 @@ #endif #if SU_HAVE_WINSOCK -SOFIAPUBFUN int inet_pton(int af, char const *src, void *dst); -SOFIAPUBFUN const char *inet_ntop(int af, void const *src, +SOFIAPUBFUN int su_inet_pton(int af, char const *src, void *dst); +SOFIAPUBFUN const char *su_inet_ntop(int af, void const *src, char *dst, size_t size); SOFIAPUBFUN ssize_t su_send(su_socket_t s, void *buffer, size_t length, int flags), @@ -351,6 +351,8 @@ #define htonl su_ntohl #else +#define su_inet_pton inet_pton +#define su_inet_ntop inet_ntop #define su_send(s,b,l,f) send((s),(b),(l),(f)) #define su_sendto(s,b,l,f,a,L) sendto((s),(b),(l),(f),(void const*)(a),(L)) #define su_recv(s,b,l,f) recv((s),(b),(l),(f)) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c Tue Dec 11 05:45:05 2007 @@ -1596,7 +1596,7 @@ if ((flags & LI_NAMEREQD) == LI_NAMEREQD) return 1; SU_DEBUG_7(("li_name: getnameinfo() failed\n")); - if (!inet_ntop(su->su_family, SU_ADDR(su), name, sizeof name)) + if (!su_inet_ntop(su->su_family, SU_ADDR(su), name, sizeof name)) return ELI_RESOLVER; } 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 Tue Dec 11 05:45:05 2007 @@ -2954,14 +2954,14 @@ #if SU_HAVE_IN6 if (su->su_family == AF_INET6) { ipaddr[0] = '['; - inet_ntop(su->su_family, SU_ADDR(su), ipaddr + 1, sizeof(ipaddr) - 1); + su_inet_ntop(su->su_family, SU_ADDR(su), ipaddr + 1, sizeof(ipaddr) - 1); strcat(ipaddr, "]"); } else { - inet_ntop(su->su_family, SU_ADDR(su), ipaddr, sizeof(ipaddr)); + su_inet_ntop(su->su_family, SU_ADDR(su), ipaddr, sizeof(ipaddr)); } #else - inet_ntop(su->su_family, SU_ADDR(su), ipaddr, sizeof(ipaddr)); + su_inet_ntop(su->su_family, SU_ADDR(su), ipaddr, sizeof(ipaddr)); #endif d->d_from->tpn_canon = ipaddr; @@ -3949,7 +3949,7 @@ #if SU_HAVE_IN6 SU_DEBUG_9(("tport_resolve addrinfo = %s%s%s:%d\n", su->su_family == AF_INET6 ? "[" : "", - inet_ntop(su->su_family, SU_ADDR(su), ipaddr, sizeof(ipaddr)), + su_inet_ntop(su->su_family, SU_ADDR(su), ipaddr, sizeof(ipaddr)), su->su_family == AF_INET6 ? "]" : "", htons(su->su_port))); #else @@ -4433,7 +4433,7 @@ su->su_port = htons(strtoul(port, NULL, 10)); - if (inet_pton(su->su_family, host, SU_ADDR(su)) > 0) { + if (su_inet_pton(su->su_family, host, SU_ADDR(su)) > 0) { resolved = 1; next = NULL; @@ -4710,7 +4710,7 @@ } #endif - if (inet_ntop(su->su_family, SU_ADDR(su), b, bufsize) == NULL) + if (su_inet_ntop(su->su_family, SU_ADDR(su), b, bufsize) == NULL) return NULL; n = strlen(b); if (bufsize < n + 2) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c Tue Dec 11 05:45:05 2007 @@ -154,7 +154,7 @@ if (msg_addrinfo(msg)->ai_flags & TP_AI_COMPRESSED) comp = ";comp=sigcomp"; - inet_ntop(su->su_family, SU_ADDR(su), name, sizeof(name)); + su_inet_ntop(su->su_family, SU_ADDR(su), name, sizeof(name)); snprintf(stamp, 128, "%s "MOD_ZU" bytes %s %s/[%s]:%u%s%s at %02u:%02u:%02u.%06lu:\n",

1 0

[commit] r6631 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: mikej Date: Tue Dec 11 05:15:58 2007 New Revision: 6631 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun_common.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun_mini.c Log: add missing header files for msvc 9 build Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun.c Tue Dec 11 05:15:58 2007 @@ -40,6 +40,7 @@ #include <assert.h> #include <string.h> #include <time.h> +#include <stdlib.h> #define SU_ROOT_MAGIC_T struct stun_magic_t 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 Tue Dec 11 05:15:58 2007 @@ -44,6 +44,7 @@ #include "stun_internal.h" #include <string.h> +#include <stdlib.h> #include <assert.h> #if HAVE_FUNC 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 Tue Dec 11 05:15:58 2007 @@ -40,6 +40,7 @@ #include <assert.h> #include <string.h> +#include <stdlib.h> typedef struct stun_bound_s stun_bound_t;

1 0

[commit] r6630 - in freeswitch/trunk/libs: udns win32/udns
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: mikej Date: Tue Dec 11 05:10:03 2007 New Revision: 6630 Modified: freeswitch/trunk/libs/udns/inet_pton.c freeswitch/trunk/libs/udns/inet_pton.h freeswitch/trunk/libs/udns/udns_resolver.c freeswitch/trunk/libs/win32/udns/libudns.vcproj Log: fix for msvc 9 build. Modified: freeswitch/trunk/libs/udns/inet_pton.c ============================================================================== --- freeswitch/trunk/libs/udns/inet_pton.c (original) +++ freeswitch/trunk/libs/udns/inet_pton.c Tue Dec 11 05:10:03 2007 @@ -69,7 +69,7 @@ * Paul Vixie, 1996. */ int -inet_pton(int af, const char *src, void *dst) +udns_inet_pton(int af, const char *src, void *dst) { switch (af) { case AF_INET: Modified: freeswitch/trunk/libs/udns/inet_pton.h ============================================================================== --- freeswitch/trunk/libs/udns/inet_pton.h (original) +++ freeswitch/trunk/libs/udns/inet_pton.h Tue Dec 11 05:10:03 2007 @@ -23,6 +23,6 @@ * $Id: inet_pton.h,v 1.7 2005/11/28 20:21:36 bagder Exp $ ***************************************************************************/ -int inet_pton(int, const char *, void *); +int udns_inet_pton(int, const char *, void *); #endif /* __INET_PTON_H */ Modified: freeswitch/trunk/libs/udns/udns_resolver.c ============================================================================== --- freeswitch/trunk/libs/udns/udns_resolver.c (original) +++ freeswitch/trunk/libs/udns/udns_resolver.c Tue Dec 11 05:10:03 2007 @@ -34,8 +34,10 @@ #define _CRT_NONSTDC_NO_DEPRECATE #endif #endif // VC8+ -#include "inet_pton.h" +int udns_inet_pton(int, const char *, void *); #include "process.h" +#else +#define udns_inet_pton inet_pton #endif # include <winsock2.h> /* includes <windows.h> */ # include <ws2tcpip.h> /* needed for struct in6_addr */ @@ -282,12 +284,12 @@ #if HAVE_INET6 { struct in_addr addr; struct in6_addr addr6; - if (inet_pton(AF_INET, serv, &addr) > 0) { + if (udns_inet_pton(AF_INET, serv, &addr) > 0) { sns->sin.sin_family = AF_INET; sns->sin.sin_addr = addr; return ++ctx->dnsc_nserv; } - if (inet_pton(AF_INET6, serv, &addr6) > 0) { + if (udns_inet_pton(AF_INET6, serv, &addr6) > 0) { sns->sin6.sin6_family = AF_INET6; sns->sin6.sin6_addr = addr6; return ++ctx->dnsc_nserv; Modified: freeswitch/trunk/libs/win32/udns/libudns.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/udns/libudns.vcproj (original) +++ freeswitch/trunk/libs/win32/udns/libudns.vcproj Tue Dec 11 05:10:03 2007 @@ -209,6 +209,10 @@ Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > + <File + RelativePath="..\..\udns\inet_pton.h" + > + </File> </Filter> <Filter Name="Resource Files"

1 0

[commit] r6629 - freeswitch/trunk/w32
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: mikej Date: Tue Dec 11 05:03:33 2007 New Revision: 6629 Modified: freeswitch/trunk/w32/modules.vsprops Log: remove param that is not used in msvc 9 Modified: freeswitch/trunk/w32/modules.vsprops ============================================================================== --- freeswitch/trunk/w32/modules.vsprops (original) +++ freeswitch/trunk/w32/modules.vsprops Tue Dec 11 05:03:33 2007 @@ -13,7 +13,6 @@ PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;MOD_EXPORTS" WarningLevel="4" WarnAsError="true" - Detect64BitPortabilityProblems="true" /> <Tool Name="VCLinkerTool"

1 0

[commit] r6628 - in freeswitch/trunk/src: . include
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: mikej Date: Tue Dec 11 05:01:55 2007 New Revision: 6628 Modified: freeswitch/trunk/src/include/switch.h freeswitch/trunk/src/switch_utils.c Log: fix for msvc 9 build. Modified: freeswitch/trunk/src/include/switch.h ============================================================================== --- freeswitch/trunk/src/include/switch.h (original) +++ freeswitch/trunk/src/include/switch.h Tue Dec 11 05:01:55 2007 @@ -71,7 +71,10 @@ #include <setjmp.h> #include <ctype.h> #include <fcntl.h> -#ifndef _MSC_VER +#ifdef _MSC_VER +#include <Winsock2.h> +#include <Ws2tcpip.h> +#else #include <strings.h> #endif #include <string.h> Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Tue Dec 11 05:01:55 2007 @@ -742,7 +742,9 @@ static char RFC2833_CHARS[] = "0123456789*#ABCDF"; -#ifdef _MSC_VER +#ifndef _MSC_VER +#define switch_inet_ntop inet_ntop +#else /* Copyright (c) 1996 by Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -772,9 +774,9 @@ * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. */ -static const char *inet_ntop4(const unsigned char *src, char *dst, size_t size); +static const char *switch_inet_ntop4(const unsigned char *src, char *dst, size_t size); #if HAVE_SIN6 -static const char *inet_ntop6(const unsigned char *src, char *dst, size_t size); +static const char *switch_inet_ntop6(const unsigned char *src, char *dst, size_t size); #endif /* char * @@ -786,15 +788,15 @@ * Paul Vixie, 1996. */ const char * -inet_ntop(int af, void const *src, char *dst, size_t size) +switch_inet_ntop(int af, void const *src, char *dst, size_t size) { switch (af) { case AF_INET: - return inet_ntop4(src, dst, size); + return switch_inet_ntop4(src, dst, size); #if HAVE_SIN6 case AF_INET6: - return inet_ntop6(src, dst, size); + return switch_inet_ntop6(src, dst, size); #endif default: return NULL; @@ -814,7 +816,7 @@ * Paul Vixie, 1996. */ static const char * -inet_ntop4(const unsigned char *src, char *dst, size_t size) +switch_inet_ntop4(const unsigned char *src, char *dst, size_t size) { static const char fmt[] = "%u.%u.%u.%u"; char tmp[sizeof "255.255.255.255"]; @@ -835,7 +837,7 @@ * Paul Vixie, 1996. */ static const char * -inet_ntop6(unsigned char const *src, char *dst, size_t size) +switch_inet_ntop6(unsigned char const *src, char *dst, size_t size) { /* * Note that int32_t and int16_t need only be "at least" large enough @@ -927,7 +929,7 @@ assert(buf); *buf = '\0'; if (in) { - inet_ntop(AF_INET, in, buf, len); + switch_inet_ntop(AF_INET, in, buf, len); } return buf; }

1 0

[commit] r6627 - freeswitch/trunk/src/mod/endpoints/mod_iax
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: mikej Date: Tue Dec 11 05:00:29 2007 New Revision: 6627 Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Log: remove unused defines which conflict w/ msvc 9 headers Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Tue Dec 11 05:00:29 2007 @@ -915,10 +915,6 @@ #define PHONE_ANSWERED 3 #define PHONE_CONNECTED 4 -#define UNREGISTERED 0 -#define REGISTERED 1 - - static switch_status_t load_config(void) { char *cf = "iax.conf";

1 0

[commit] r6626 - freeswitch/trunk/libs/apr/include/arch/win32
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: mikej Date: Tue Dec 11 04:52:42 2007 New Revision: 6626 Modified: freeswitch/trunk/libs/apr/include/arch/win32/apr_arch_networkio.h Log: msvc 9 build tweak. Modified: freeswitch/trunk/libs/apr/include/arch/win32/apr_arch_networkio.h ============================================================================== --- freeswitch/trunk/libs/apr/include/arch/win32/apr_arch_networkio.h (original) +++ freeswitch/trunk/libs/apr/include/arch/win32/apr_arch_networkio.h Tue Dec 11 04:52:42 2007 @@ -20,6 +20,9 @@ #include "apr_network_io.h" #include "apr_general.h" #include "apr_poll.h" +#ifdef _MSC_VER +#undef MCAST_JOIN_SOURCE_GROUP +#endif typedef struct sock_userdata_t sock_userdata_t; struct sock_userdata_t {

1 0

[commit] r6625 - freeswitch/trunk/src
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: mikej Date: Mon Dec 10 23:21:54 2007 New Revision: 6625 Modified: freeswitch/trunk/src/switch_ivr.c Log: reduce indentation / cleanup Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Dec 10 23:21:54 2007 @@ -74,7 +74,6 @@ } } - return status; } @@ -128,28 +127,27 @@ channel = switch_core_session_get_channel(session); assert(channel != NULL); - if (switch_channel_test_flag(channel, CF_UNICAST)) { - if ((conninfo = switch_channel_get_private(channel, "unicast"))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Shutting down unicast connection\n"); - switch_clear_flag_locked(conninfo, SUF_READY); - switch_socket_shutdown(conninfo->socket, SWITCH_SHUTDOWN_READWRITE); - while(switch_test_flag(conninfo, SUF_THREAD_RUNNING)) { - switch_yield(10000); - if (++sanity >= 10000) { - break; - } - } - if (conninfo->read_codec.implementation) { - switch_core_codec_destroy(&conninfo->read_codec); + if (!switch_channel_test_flag(channel, CF_UNICAST)) { + return SWITCH_STATUS_FALSE; + } + + if ((conninfo = switch_channel_get_private(channel, "unicast"))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Shutting down unicast connection\n"); + switch_clear_flag_locked(conninfo, SUF_READY); + switch_socket_shutdown(conninfo->socket, SWITCH_SHUTDOWN_READWRITE); + while(switch_test_flag(conninfo, SUF_THREAD_RUNNING)) { + switch_yield(10000); + if (++sanity >= 10000) { + break; } - switch_socket_close(conninfo->socket); } - switch_channel_clear_flag(channel, CF_UNICAST); - return SWITCH_STATUS_SUCCESS; + if (conninfo->read_codec.implementation) { + switch_core_codec_destroy(&conninfo->read_codec); + } + switch_socket_close(conninfo->socket); } - - return SWITCH_STATUS_FALSE; - + switch_channel_clear_flag(channel, CF_UNICAST); + return SWITCH_STATUS_SUCCESS; } SWITCH_DECLARE(switch_status_t) switch_ivr_activate_unicast(switch_core_session_t *session, @@ -219,7 +217,6 @@ conninfo->write_frame.data = conninfo->write_frame_data; conninfo->write_frame.buflen = sizeof(conninfo->write_frame_data); conninfo->write_frame.codec = switch_test_flag(conninfo, SUF_NATIVE) ? read_codec : &conninfo->read_codec; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "connect %s:%d->%s:%d\n", conninfo->local_ip, conninfo->local_port, conninfo->remote_ip, conninfo->remote_port); @@ -256,8 +253,6 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Failure creating unicast connection %s:%d->%s:%d\n", conninfo->local_ip, conninfo->local_port, conninfo->remote_ip, conninfo->remote_port); return SWITCH_STATUS_FALSE; - - } SWITCH_DECLARE(switch_status_t) switch_ivr_parse_event(switch_core_session_t *session, switch_event_t *event) @@ -290,7 +285,6 @@ switch_channel_set_flag(channel, CF_EVENT_LOCK); } - if (lead_frames) { switch_frame_t *read_frame; int frame_count = atoi(lead_frames); @@ -380,7 +374,6 @@ switch_channel_clear_flag(channel, CF_EVENT_LOCK); return status; - } SWITCH_DECLARE(switch_status_t) switch_ivr_parse_all_events(switch_core_session_t *session) @@ -814,22 +807,17 @@ } if ((flags & SMF_FORCE) || !switch_channel_test_flag(channel, CF_BYPASS_MEDIA)) { - //switch_ivr_parse_all_events(session); switch_core_session_receive_message(session, &msg); if ((flags & SMF_REBRIDGE) && (other_uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) && (other_session = switch_core_session_locate(other_uuid))) { other_channel = switch_core_session_get_channel(other_session); assert(other_channel != NULL); - //switch_ivr_parse_all_events(other_session); switch_core_session_receive_message(other_session, &msg); switch_channel_clear_state_handler(other_channel, NULL); - } - - if (other_channel) { switch_channel_clear_state_handler(channel, NULL); if (swap) { @@ -959,7 +947,6 @@ prefix = 1; } - if (var && !prefix) { if ((val = switch_channel_get_variable(chana, var))) { switch_channel_set_variable(chanb, var, val); @@ -1112,7 +1099,6 @@ parser->minlen = 0; parser->maxlen = 0; } - } } if (status != SWITCH_STATUS_SUCCESS) { @@ -1289,30 +1275,25 @@ SWITCH_DECLARE(int) switch_ivr_set_xml_chan_vars(switch_xml_t xml, switch_channel_t *channel, int off) { - switch_event_header_t *hi; switch_xml_t variable; + switch_event_header_t *hi = switch_channel_variable_first(channel); - if ((hi = switch_channel_variable_first(channel))) { - for (; hi; hi = hi->next) { - char *vvar = hi->name; - char *vval = hi->value; - if (vvar && vval) { - if ((variable = switch_xml_add_child_d(xml, (char *) vvar, off++))) { - char *data; - char *value = (char *) vval; - switch_size_t dlen = strlen(value) * 3; - - if ((data = malloc(dlen))) { - memset(data, 0, dlen); - switch_url_encode(value, data, dlen); - switch_xml_set_txt_d(variable, data); - free(data); - } - } + if (!hi) return off; + + for (; hi; hi = hi->next) { + if (hi->name && hi->value && ((variable = switch_xml_add_child_d(xml, hi->name, off++)))) { + char *data; + switch_size_t dlen = strlen(hi->value) * 3; + + if ((data = malloc(dlen))) { + memset(data, 0, dlen); + switch_url_encode(hi->value, data, dlen); + switch_xml_set_txt_d(variable, data); + free(data); } } - switch_channel_variable_last(channel); } + switch_channel_variable_last(channel); return off; } @@ -1430,10 +1411,8 @@ } } } - } - if (!(x_main_cp = switch_xml_add_child_d(x_callflow, "caller_profile", cf_off++))) { goto error; } @@ -1469,7 +1448,6 @@ } } - if (caller_profile->times) { int t_off = 0; if (!(x_times = switch_xml_add_child_d(x_callflow, "times", cf_off++))) { @@ -1503,9 +1481,6 @@ caller_profile = caller_profile->next; } - - - *xml_cdr = cdr; return SWITCH_STATUS_SUCCESS;

1 0

[commit] r6624 - freeswitch/trunk/src
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: mikej Date: Mon Dec 10 22:57:15 2007 New Revision: 6624 Modified: freeswitch/trunk/src/switch_rtp.c Log: reduce indentation / cleanup Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Dec 10 22:57:15 2007 @@ -177,33 +177,34 @@ static switch_status_t ice_out(switch_rtp_t *rtp_session) { + uint8_t buf[256] = { 0 }; + switch_stun_packet_t *packet; + unsigned int elapsed; + switch_size_t bytes; assert(rtp_session != NULL); assert(rtp_session->ice_user != NULL); - if (rtp_session->stuncount == 0) { - uint8_t buf[256] = { 0 }; - switch_stun_packet_t *packet; - unsigned int elapsed; - switch_size_t bytes; + if (rtp_session->stuncount != 0) { + rtp_session->stuncount--; + return SWITCH_STATUS_SUCCESS; + } - if (rtp_session->last_stun) { - elapsed = (unsigned int) ((switch_time_now() - rtp_session->last_stun) / 1000); + if (rtp_session->last_stun) { + elapsed = (unsigned int) ((switch_time_now() - rtp_session->last_stun) / 1000); - if (elapsed > 30000) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No stun for a long time (PUNT!)\n"); - return SWITCH_STATUS_FALSE; - } + if (elapsed > 30000) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No stun for a long time (PUNT!)\n"); + return SWITCH_STATUS_FALSE; } - - packet = switch_stun_packet_build_header(SWITCH_STUN_BINDING_REQUEST, NULL, buf); - switch_stun_packet_attribute_add_username(packet, rtp_session->ice_user, 32); - bytes = switch_stun_packet_length(packet); - switch_socket_sendto(rtp_session->sock, rtp_session->remote_addr, 0, (void *) packet, &bytes); - rtp_session->stuncount = 25; - } else { - rtp_session->stuncount--; } + + packet = switch_stun_packet_build_header(SWITCH_STUN_BINDING_REQUEST, NULL, buf); + switch_stun_packet_attribute_add_username(packet, rtp_session->ice_user, 32); + bytes = switch_stun_packet_length(packet); + switch_socket_sendto(rtp_session->sock, rtp_session->remote_addr, 0, (void *) packet, &bytes); + rtp_session->stuncount = 25; + return SWITCH_STATUS_SUCCESS; } @@ -218,7 +219,6 @@ packet = switch_stun_packet_parse(buf, sizeof(buf)); rtp_session->last_stun = switch_time_now(); - switch_stun_packet_first_attribute(packet, attr); do { @@ -238,7 +238,6 @@ } } while (switch_stun_packet_next_attribute(attr)); - /* printf("[%s] [%s] [%s]\n", rtp_session->user_ice, username, !strcmp(rtp_session->user_ice, username) ? "yes" : "no"); */ if ((packet->header.type == SWITCH_STUN_BINDING_REQUEST) && !strcmp(rtp_session->user_ice, username)) { uint8_t buf[512]; switch_stun_packet_t *rpacket; @@ -249,11 +248,7 @@ memset(buf, 0, sizeof(buf)); rpacket = switch_stun_packet_build_header(SWITCH_STUN_BINDING_RESPONSE, packet->header.id, buf); switch_stun_packet_attribute_add_username(rpacket, username, 32); - /* switch_sockaddr_ip_get(&remote_ip, rtp_session->from_addr); */ - remote_ip = switch_get_addr(ipbuf, sizeof(ipbuf), rtp_session->from_addr); - - switch_stun_packet_attribute_add_binded_address(rpacket, (char *)remote_ip, switch_sockaddr_get_port(rtp_session->from_addr)); bytes = switch_stun_packet_length(rpacket); switch_socket_sendto(rtp_session->sock, rtp_session->from_addr, 0, (void *) rpacket, &bytes); @@ -459,7 +454,6 @@ return SWITCH_STATUS_MEMERR; } - rtp_session->dtmf_data.out_digit_ssrc = ssrc; rtp_session->pool = pool; rtp_session->te = 101; @@ -486,9 +480,7 @@ policy.rtp.sec_serv = sec_serv_conf_and_auth; policy.rtcp.sec_serv = sec_serv_none; - /* - * read key from hexadecimal on command line into an octet string - */ + /* read key from hexadecimal on command line into an octet string */ len = hex_string_to_octet_string(key, crypto_key, MASTER_KEY_LEN * 2); /* check that hex string is the right length */ @@ -506,16 +498,12 @@ return SWITCH_STATUS_FALSE; } - /* switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "set master key/salt to %s/", octet_string_hex_string(key, 16)); - * switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "%s\n", octet_string_hex_string(key+16, 14)); - */ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Activating Secure RTP!\n"); } rtp_session->seq = (uint16_t) rand(); rtp_session->send_msg.header.ssrc = htonl(ssrc); rtp_session->send_msg.header.ts = 0; - //rtp_session->send_msg.header.seq = (uint16_t) rand(); rtp_session->send_msg.header.m = 0; rtp_session->send_msg.header.pt = (switch_payload_t) htonl(payload); rtp_session->send_msg.header.version = 2; @@ -602,7 +590,6 @@ } rtp_session->ready = 1; - return rtp_session; } @@ -615,15 +602,12 @@ SWITCH_DECLARE(void) switch_rtp_set_cng_pt(switch_rtp_t *rtp_session, switch_payload_t pt) { - rtp_session->cng_pt = pt; - } SWITCH_DECLARE(switch_status_t) switch_rtp_activate_jitter_buffer(switch_rtp_t *rtp_session, uint32_t queue_frames) { rtp_session->jb = stfu_n_init(queue_frames); - return SWITCH_STATUS_SUCCESS; } @@ -700,7 +684,6 @@ } switch_mutex_unlock((*rtp_session)->flag_mutex); - return; } @@ -736,7 +719,6 @@ SWITCH_DECLARE(void) switch_rtp_set_flag(switch_rtp_t *rtp_session, switch_rtp_flag_t flags) { - switch_set_flag_locked(rtp_session, flags); if (flags & SWITCH_RTP_FLAG_AUTOADJ) { rtp_session->autoadj_window = 20; @@ -746,16 +728,12 @@ SWITCH_DECLARE(uint8_t) switch_rtp_test_flag(switch_rtp_t *rtp_session, switch_rtp_flag_t flags) { - return (uint8_t) switch_test_flag(rtp_session, flags); - } SWITCH_DECLARE(void) switch_rtp_clear_flag(switch_rtp_t *rtp_session, switch_rtp_flag_t flags) { - switch_clear_flag_locked(rtp_session, flags); - } @@ -777,14 +755,9 @@ duration = rtp_session->dtmf_data.out_digit_sofar; } - rtp_session->dtmf_data.out_digit_packet[2] = (unsigned char) (duration >> 8); rtp_session->dtmf_data.out_digit_packet[3] = (unsigned char) duration; - - - rtp_session->dtmf_data.timestamp_dtmf += samples; - for (x = 0; x < loops; x++) { rtp_session->seq++; @@ -799,14 +772,11 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Send %s packet for [%c] ts=%d sofar=%u dur=%d seq=%d\n", loops == 1 ? "middle" : "end", rtp_session->dtmf_data.out_digit, rtp_session->dtmf_data.timestamp_dtmf, rtp_session->dtmf_data.out_digit_sofar, duration, rtp_session->seq); - - } if (loops != 1) { rtp_session->sending_dtmf = 0; } - } if (!rtp_session->dtmf_data.out_digit_dur && rtp_session->dtmf_data.dtmf_queue && switch_queue_size(rtp_session->dtmf_data.dtmf_queue)) { @@ -975,9 +945,6 @@ *payload_type = (switch_payload_t)rtp_session->recv_msg.header.pt; return 2 + rtp_header_len; } - - - if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE)) { int sbytes = (int) bytes; @@ -1003,7 +970,6 @@ } return 0; } - if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ) && switch_sockaddr_get_port(rtp_session->from_addr)) { const char *tx_host; @@ -1032,21 +998,16 @@ } } - - if (bytes && rtp_session->cng_pt && rtp_session->recv_msg.header.pt == rtp_session->cng_pt) { goto do_continue; } - - if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_GOOGLEHACK) && rtp_session->recv_msg.header.pt == 102) { rtp_session->recv_msg.header.pt = 97; } rtp_session->rseq = ntohs((uint16_t) rtp_session->recv_msg.header.seq); rtp_session->rpayload = (switch_payload_t) rtp_session->recv_msg.header.pt; - /* RFC2833 ... TBD try harder to honor the duration etc. */ if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833) @@ -1057,7 +1018,6 @@ char key = switch_rfc2833_to_char(packet[0]); uint16_t in_digit_seq = ntohs((uint16_t) rtp_session->recv_msg.header.seq); - /* SHEESH.... Curse you RFC2833 inventors!!!! */ if ((time(NULL) - rtp_session->dtmf_data.last_digit_time) > 2) { rtp_session->dtmf_data.last_digit = 0; @@ -1084,11 +1044,8 @@ rtp_session->dtmf_data.dc = 0; } } - goto do_continue; } - - break; do_continue: @@ -1102,7 +1059,6 @@ *payload_type = (switch_payload_t) rtp_session->recv_msg.header.pt; - if (*payload_type == SWITCH_RTP_CNG_PAYLOAD) { *flags |= SFF_CNG; } @@ -1114,8 +1070,6 @@ return (int) bytes; } - - SWITCH_DECLARE(switch_size_t) switch_rtp_has_dtmf(switch_rtp_t *rtp_session) { switch_size_t has = 0; @@ -1181,7 +1135,6 @@ switch_mutex_unlock(rtp_session->dtmf_data.dtmf_mutex); return bytes; - } @@ -1209,7 +1162,6 @@ return SWITCH_STATUS_MEMERR; } } - return SWITCH_STATUS_SUCCESS; } @@ -1275,8 +1227,6 @@ } frame->datalen = bytes; - - return SWITCH_STATUS_SUCCESS; } @@ -1285,7 +1235,6 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_zerocopy_read(switch_rtp_t *rtp_session, void **data, uint32_t * datalen, switch_payload_t *payload_type, switch_frame_flag_t *flags) { - int bytes = 0; if (!switch_rtp_ready(rtp_session)) { @@ -1383,7 +1332,6 @@ if (rtp_session->vad_data.scan_freq && rtp_session->vad_data.next_scan <= now) { rtp_session->vad_data.bg_count = rtp_session->vad_data.bg_level = 0; rtp_session->vad_data.next_scan = now + rtp_session->vad_data.scan_freq; - /* printf("RESCAN\n"); */ } if (switch_core_codec_decode(&rtp_session->vad_data.vad_codec, @@ -1417,9 +1365,6 @@ rtp_session->vad_data.bg_level += score; if (++rtp_session->vad_data.bg_count == rtp_session->vad_data.bg_len) { rtp_session->vad_data.bg_level /= rtp_session->vad_data.bg_len; - /* rtp_session->vad_data.bg_level += (rtp_session->vad_data.bg_level / 3); - * printf("AVG %u\n", rtp_session->vad_data.bg_level); - */ } send = 1; } else { @@ -1502,7 +1447,6 @@ } return (int) bytes; - } @@ -1590,7 +1534,6 @@ } return rtp_common_write(rtp_session, data, datalen, rtp_session->payload, flags); - } SWITCH_DECLARE(int) switch_rtp_write_frame(switch_rtp_t *rtp_session, switch_frame_t *frame, uint32_t ts) @@ -1600,7 +1543,6 @@ uint32_t len; switch_payload_t payload; - if (!switch_rtp_ready(rtp_session)) { return -1; } @@ -1624,7 +1566,6 @@ (uint32_t)(frame->timestamp), frame->seq, frame->ssrc, &frame->flags); } - if (fwd) { data = frame->packet; len = frame->packetlen; @@ -1648,7 +1589,6 @@ } return rtp_common_write(rtp_session, data, len, payload, &frame->flags); - } SWITCH_DECLARE(int) switch_rtp_write_manual(switch_rtp_t *rtp_session, @@ -1690,13 +1630,10 @@ bytes = sbytes; } - if (switch_socket_sendto(rtp_session->sock, rtp_session->remote_addr, 0, (void *) &send_msg, &bytes) != SWITCH_STATUS_SUCCESS) { return -1; } return (int) bytes; - - //return rtp_common_write(rtp_session, (void *) &send_msg, rtp_header_len + datalen, m, payload); } SWITCH_DECLARE(uint32_t) switch_rtp_get_ssrc(switch_rtp_t *rtp_session)

1 0