July 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8920 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta libsofia-sip-ua/nth libsofia-sip-ua/nua libsofia-sip-ua/sresolv libsofia-sip-ua/stun libsofia-sip-ua/su libsofia-sip-ua/tport tests utils
by Freeswitch SVN 08 Jul '08

08 Jul '08

Author: mikej Date: Tue Jul 8 00:36:13 2008 New Revision: 8920 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/test_nth.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/resolve_sip.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/test_sresolv.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stunc.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/addrinfo.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/localinfo.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_addrinfo.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_proxy.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_su.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_su_osx.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_root.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_root_osx.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_stun.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c freeswitch/trunk/libs/sofia-sip/tests/test_init.c freeswitch/trunk/libs/sofia-sip/tests/test_nat.c freeswitch/trunk/libs/sofia-sip/utils/sip-dig.c Log: Thu Jun 5 10:23:18 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * Using su_inet_ntop and su_inet_pton Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Jul 8 00:36:13 2008 @@ -1 +1 @@ -Thu Jun 5 12:20:19 EDT 2008 +Tue Jul 8 00:36:02 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c Tue Jul 8 00:36:13 2008 @@ -636,16 +636,16 @@ *m->m_url = *ag->ag_contact->m_url; if (host_is_ip4_address(m->m_url->url_host)) { - inet_pton(su->su_family = AF_INET, - m->m_url->url_host, - &su->su_sin.sin_addr); + su_inet_pton(su->su_family = AF_INET, + m->m_url->url_host, + &su->su_sin.sin_addr); ag->ag_su_nta_len = (sizeof su->su_sin); } else { TEST_1(host_is_ip_address(m->m_url->url_host)); - inet_pton(su->su_family = AF_INET6, - m->m_url->url_host, - &su->su_sin6.sin6_addr); + su_inet_pton(su->su_family = AF_INET6, + m->m_url->url_host, + &su->su_sin6.sin6_addr); ag->ag_su_nta_len = (sizeof su->su_sin6); } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/test_nth.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/test_nth.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/test_nth.c Tue Jul 8 00:36:13 2008 @@ -185,7 +185,7 @@ t->t_addr->su_len = (sizeof t->t_addr->su_sin); s = su_socket(t->t_addr->su_family = AF_INET, SOCK_STREAM, 0); TEST_1(s != INVALID_SOCKET); - TEST_1(inet_pton(AF_INET, "127.0.0.1", &t->t_addr->su_sin.sin_addr) >= 0); + TEST_1(su_inet_pton(AF_INET, "127.0.0.1", &t->t_addr->su_sin.sin_addr) >= 0); TEST_1(bind(s, &t->t_addr->su_sa, t->t_addrlen = (sizeof t->t_addr->su_sin)) != -1); TEST_1(getsockname(s, &t->t_addr->su_sa, &t->t_addrlen) != -1); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.c Tue Jul 8 00:36:13 2008 @@ -1365,7 +1365,7 @@ assert(s2->dns.reg != 0); - inet_pton(AF_INET, "127.0.0.1", &localhost); + su_inet_pton(AF_INET, "127.0.0.1", &localhost); va_start(va0, use_naptr); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/resolve_sip.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/resolve_sip.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/resolve_sip.c Tue Jul 8 00:36:13 2008 @@ -221,7 +221,7 @@ if (a->a_record->r_status) 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)); printf("%s@%s:%u\n", sr->sr_tport, addr, sr->sr_port); sr->sr_exitcode = 0; } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/test_sresolv.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/test_sresolv.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/test_sresolv.c Tue Jul 8 00:36:13 2008 @@ -184,6 +184,11 @@ #endif #endif #endif + +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); + #else #define sres_send(s,b,len,flags) send((s),(b),(len),(flags)) @@ -195,6 +200,10 @@ #define SOCKET_ERROR (-1) #define INVALID_SOCKET ((sres_socket_t)-1) #define sres_socket(x,y,z) socket((x),(y),(z)) + +#define su_inet_pton inet_pton +#define su_inet_ntop inet_ntop + #endif #if 1 @@ -264,8 +273,8 @@ a1len = a2len = a3len = a4len = sizeof (struct sockaddr_in6); if (af == AF_INET) { - TEST_1(inet_pton(af, "127.0.0.1", &sin3->sin_addr) > 0); - TEST_1(inet_pton(af, "127.0.0.1", &sin4->sin_addr) > 0); + TEST_1(su_inet_pton(af, "127.0.0.1", &sin3->sin_addr) > 0); + TEST_1(su_inet_pton(af, "127.0.0.1", &sin4->sin_addr) > 0); } else { } @@ -734,7 +743,7 @@ TEST(rr_a6->a6_record->r_ttl, 60); TEST(rr_a6->a6_prelen, 0); - TEST_S(inet_ntop(AF_INET6, &rr_a6->a6_suffix, buf, sizeof(buf)), + TEST_S(su_inet_ntop(AF_INET6, &rr_a6->a6_suffix, buf, sizeof(buf)), "3ffe:1200:3012:c000:210:a4ff:fe8d:6a46"); TEST_P(rr_a6->a6_prename, NULL); @@ -748,7 +757,7 @@ TEST(rr_a6->a6_record->r_ttl, 60); TEST(rr_a6->a6_prelen, 0); - TEST_S(inet_ntop(AF_INET6, &rr_a6->a6_suffix, buf, sizeof(buf)), + TEST_S(su_inet_ntop(AF_INET6, &rr_a6->a6_suffix, buf, sizeof(buf)), "3ffe:1200:3012:c000:210:a4ff:fe8d:6a46"); TEST_P(rr_a6->a6_prename, NULL); @@ -778,7 +787,7 @@ TEST(rr_a6->a6_record->r_ttl, 60); TEST(rr_a6->a6_prelen, 64); - TEST_S(inet_ntop(AF_INET6, &rr_a6->a6_suffix, buf, sizeof(buf)), + TEST_S(su_inet_ntop(AF_INET6, &rr_a6->a6_suffix, buf, sizeof(buf)), "::a08:20ff:fe7d:e7ac"); TEST_S(rr_a6->a6_prename, "mynet.example.com."); @@ -795,7 +804,7 @@ TEST(rr_a6->a6_record->r_class, sres_class_in); TEST(rr_a6->a6_record->r_ttl, 60); TEST(rr_a6->a6_prelen, 0); - TEST_S(inet_ntop(AF_INET6, &rr_a6->a6_suffix, buf, sizeof(buf)), + TEST_S(su_inet_ntop(AF_INET6, &rr_a6->a6_suffix, buf, sizeof(buf)), "3ff0:12:3012:c006:a08:20ff:fe7d:e7ac"); TEST_P(rr_a6->a6_prename, NULL); @@ -811,7 +820,7 @@ TEST(rr_a6->a6_record->r_class, sres_class_in); TEST(rr_a6->a6_record->r_ttl, 60); TEST(rr_a6->a6_prelen, 128); - TEST_S(inet_ntop(AF_INET6, &rr_a6->a6_suffix, buf, sizeof(buf)), "::"); + TEST_S(su_inet_ntop(AF_INET6, &rr_a6->a6_suffix, buf, sizeof(buf)), "::"); TEST_S(rr_a6->a6_prename, "a6.example.com."); sres_free_answers(res, ctx->result), ctx->result = NULL; @@ -824,7 +833,7 @@ TEST(rr_a6->a6_record->r_ttl, 60); TEST(rr_a6->a6_prelen, 64); - TEST_S(inet_ntop(AF_INET6, &rr_a6->a6_suffix, buf, sizeof(buf)), + TEST_S(su_inet_ntop(AF_INET6, &rr_a6->a6_suffix, buf, sizeof(buf)), "::a08:20ff:fe7d:e7ac"); TEST_S(rr_a6->a6_prename, "mynet.example.com."); @@ -853,7 +862,7 @@ TEST(rr_aaaa->aaaa_record->r_class, sres_class_in); TEST(rr_aaaa->aaaa_record->r_ttl, 60); - TEST_S(inet_ntop(AF_INET6, &rr_aaaa->aaaa_addr, buf, sizeof(buf)), + TEST_S(su_inet_ntop(AF_INET6, &rr_aaaa->aaaa_addr, buf, sizeof(buf)), "3ffe:1200:3012:c000:206:5bff:fe55:4630"); sres_free_answers(res, ctx->result), ctx->result = NULL; @@ -865,7 +874,7 @@ TEST(rr_aaaa->aaaa_record->r_class, sres_class_in); TEST(rr_aaaa->aaaa_record->r_ttl, 60); - TEST_S(inet_ntop(AF_INET6, &rr_aaaa->aaaa_addr, buf, sizeof(buf)), + TEST_S(su_inet_ntop(AF_INET6, &rr_aaaa->aaaa_addr, buf, sizeof(buf)), "3ffe:1200:3012:c000:206:5bff:fe55:4630"); sres_free_answers(res, result), result = NULL; @@ -1027,7 +1036,7 @@ const sres_ptr_record_t *rr; struct sockaddr_in sin = {0}; - inet_pton(AF_INET, "127.0.0.1", &sin.sin_addr); + su_inet_pton(AF_INET, "127.0.0.1", &sin.sin_addr); sin.sin_family = AF_INET; BEGIN(); @@ -1089,8 +1098,8 @@ BEGIN(); - inet_pton(AF_INET6, "3ffe:1200:3012:c000:0a08:20ff:fe7d:e7ac", - &sin6.sin6_addr); + su_inet_pton(AF_INET6, "3ffe:1200:3012:c000:0a08:20ff:fe7d:e7ac", + &sin6.sin6_addr); sin6.sin6_family = AF_INET6; @@ -1154,9 +1163,9 @@ sres_query(res, test_answer_multi, ctx, sres_type_aaaa, "mgw02.example.com"); - inet_pton(AF_INET6, - "3ffe:1200:3012:c000:0a08:20ff:fe7d:e7ac", - &sin6.sin6_addr); + su_inet_pton(AF_INET6, + "3ffe:1200:3012:c000:0a08:20ff:fe7d:e7ac", + &sin6.sin6_addr); sin6.sin6_family = AF_INET6; @@ -1361,7 +1370,7 @@ TEST(rr_a6->a6_record->r_ttl, 60); TEST(rr_a6->a6_prelen, 0); - TEST_S(inet_ntop(AF_INET6, &rr_a6->a6_suffix, buf, sizeof(buf)), "3ff0::"); + TEST_S(su_inet_ntop(AF_INET6, &rr_a6->a6_suffix, buf, sizeof(buf)), "3ff0::"); TEST_P(rr_a6->a6_prename, NULL); @@ -1373,7 +1382,7 @@ TEST(rr_aaaa->aaaa_record->r_type, sres_type_aaaa); TEST(rr_aaaa->aaaa_record->r_class, sres_class_in); TEST(rr_aaaa->aaaa_record->r_ttl, 60); - TEST_S(inet_ntop(AF_INET6, &rr_aaaa->aaaa_addr, buf, sizeof(buf)), + TEST_S(su_inet_ntop(AF_INET6, &rr_aaaa->aaaa_addr, buf, sizeof(buf)), "3ffe:1200:3012:c000:206:5bff:fe55:462f"); sres_free_answers(res, result); @@ -1416,7 +1425,7 @@ TEST(rr_aaaa->aaaa_record->r_type, sres_type_aaaa); TEST(rr_aaaa->aaaa_record->r_class, sres_class_in); TEST(rr_aaaa->aaaa_record->r_ttl, 60); - TEST_S(inet_ntop(AF_INET6, &rr_aaaa->aaaa_addr, buf, sizeof(buf)), + TEST_S(su_inet_ntop(AF_INET6, &rr_aaaa->aaaa_addr, buf, sizeof(buf)), "3ffe:1200:3012:c000:206:5bff:fe55:462f"); TEST_P(result[1], NULL); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stunc.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stunc.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stunc.c Tue Jul 8 00:36:13 2008 @@ -276,8 +276,8 @@ } SU_DEBUG_0(("%s: local address NATed as %s:%u\n", __func__, - inet_ntop(sa->su_family, SU_ADDR(sa), - ipaddr, sizeof(ipaddr)), + su_inet_ntop(sa->su_family, SU_ADDR(sa), + ipaddr, sizeof(ipaddr)), (unsigned) ntohs(sa->su_port))); break; @@ -428,8 +428,8 @@ err = bind(s, (struct sockaddr *)&sockaddr, socklen); if (err < 0) { SU_DEBUG_1(("%s: Error %d binding to %s:%u\n", __func__, err, - inet_ntop(sockaddr.su_family, SU_ADDR(&sockaddr), - ipaddr, sizeof(ipaddr)), + su_inet_ntop(sockaddr.su_family, SU_ADDR(&sockaddr), + ipaddr, sizeof(ipaddr)), (unsigned) ntohs(sockaddr.su_port))); return -1; } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/addrinfo.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/addrinfo.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/addrinfo.c Tue Jul 8 00:36:13 2008 @@ -143,7 +143,7 @@ #endif port = ntohs(su->su_port); - inet_ntop(ai->ai_family, SU_ADDR(su), buffer, sizeof(buffer)); + su_inet_ntop(ai->ai_family, SU_ADDR(su), buffer, sizeof(buffer)); printf("%d@[%s]:%u", ai->ai_protocol, buffer, port); if (ai->ai_flags & AI_CANONNAME) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/localinfo.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/localinfo.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/localinfo.c Tue Jul 8 00:36:13 2008 @@ -167,8 +167,8 @@ fputs(li->li_canonname, stdout); } else { - inet_ntop(li->li_family, SU_ADDR(li->li_addr), - buffer, sizeof(buffer)); + su_inet_ntop(li->li_family, SU_ADDR(li->li_addr), + buffer, sizeof(buffer)); printf("%s maddr=[%s]", li->li_canonname, buffer); } if (li->li_scope & LI_SCOPE_GLOBAL) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_addrinfo.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_addrinfo.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_addrinfo.c Tue Jul 8 00:36:13 2008 @@ -223,7 +223,7 @@ /* translator hack */ { char *q = getenv("GAI"); - if (q && inet_pton(AF_INET6, q, &faith_prefix) == 1) + if (q && su_inet_pton(AF_INET6, q, &faith_prefix) == 1) translate = YES; } firsttime = 0; @@ -411,7 +411,7 @@ /* hostname as numeric name */ for (i = 0; gai_afdl[i].a_af; i++) { - if (inet_pton(gai_afdl[i].a_af, hostname, pton)) { + if (su_inet_pton(gai_afdl[i].a_af, hostname, pton)) { u_long v4a; u_char pfx; @@ -752,7 +752,7 @@ if (host == NULL || hostlen == 0) { /* what should we do? */ } else if (flags & NI_NUMERICHOST) { - if (inet_ntop(gni_afd->a_af, addr, numaddr, sizeof(numaddr)) + if (su_inet_ntop(gni_afd->a_af, addr, numaddr, sizeof(numaddr)) == NULL) return ENI_SYSTEM; if (strlen(numaddr) > hostlen) @@ -784,7 +784,8 @@ } else { if (flags & NI_NAMEREQD) return ENI_NOHOSTNAME; - if (inet_ntop(gni_afd->a_af, addr, numaddr, sizeof(numaddr)) + if (su_inet_ntop(gni_afd->a_af, addr, + numaddr, sizeof(numaddr)) == NULL) return ENI_NOHOSTNAME; if (strlen(numaddr) > hostlen) 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 Jul 8 00:36:13 2008 @@ -1047,7 +1047,7 @@ sa = calloc(1, sizeof(su_sockaddr_t)); sa->su_family = AF_INET6; - if (inet_pton(AF_INET6, addr, &sa->su_sin6.sin6_addr) <= 0) + if (su_inet_pton(AF_INET6, addr, &sa->su_sin6.sin6_addr) <= 0) goto err; s = su_socket(AF_INET6, SOCK_DGRAM, 0); @@ -1105,7 +1105,7 @@ li->li_addrlen = sizeof(*su); li->li_addr = su = (su_sockaddr_t *)(li + 1); su->su_family = li->li_family = AF_INET6; - if (inet_pton(AF_INET6, addr, &su->su_sin6.sin6_addr) <= 0) + if (su_inet_pton(AF_INET6, addr, &su->su_sin6.sin6_addr) <= 0) goto err; if (li->li_flags & LI_IFNAME) li->li_ifname = ifname; Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_proxy.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_proxy.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_proxy.c Tue Jul 8 00:36:13 2008 @@ -373,7 +373,7 @@ char buf[SU_ADDRSIZE]; SU_DEBUG_3(("accept: connection from %s:%u\n", - inet_ntop(su->su_family, SU_ADDR(su), buf, sizeof(buf)), + su_inet_ntop(su->su_family, SU_ADDR(su), buf, sizeof(buf)), ntohs(su->su_port))); if (!su_wait_create(f->f_wait, f->f_socket, SU_WAIT_IN) && @@ -628,7 +628,7 @@ char buf[SU_ADDRSIZE]; SU_DEBUG_3(("forwarder_shutdown: shutdown from %s:%u\n", - inet_ntop(su->su_family, SU_ADDR(su), buf, sizeof(buf)), + su_inet_ntop(su->su_family, SU_ADDR(su), buf, sizeof(buf)), ntohs(su->su_port))); if (su_root_unregister(f->f_pr->pr_root, f->f_wait, forwarder_recv, f) < 0) { @@ -663,9 +663,9 @@ su2 = f->f_dest, su1 = f->f_peer->f_dest, d2 = "up", d1 = "down"; SU_DEBUG_3(("forwarder_close: connection from %s:%u to %s:%d\n", - inet_ntop(su1->su_family, SU_ADDR(su1), buf1, sizeof(buf1)), + su_inet_ntop(su1->su_family, SU_ADDR(su1), buf1, sizeof(buf1)), ntohs(su1->su_port), - inet_ntop(su2->su_family, SU_ADDR(su2), buf2, sizeof(buf2)), + su_inet_ntop(su2->su_family, SU_ADDR(su2), buf2, sizeof(buf2)), ntohs(su2->su_port))); forwarder_destroy(f); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_su.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_su.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_su.c Tue Jul 8 00:36:13 2008 @@ -116,7 +116,7 @@ if (opt_verbatim) printf("udpsocket: using address [%s]:%u\n", - inet_ntop(su.su_family, SU_ADDR(&su), nbuf, sizeof(nbuf)), + su_inet_ntop(su.su_family, SU_ADDR(&su), nbuf, sizeof(nbuf)), ntohs(su.su_sin.sin_port)); return s; @@ -183,7 +183,7 @@ if (opt_verbatim) printf("do_rtt: %d bytes from [%s]:%u: \"%s\", rtt = %lg ms\n", - n, inet_ntop(su.su_family, SU_ADDR(&su), nbuf, sizeof(nbuf)), + n, su_inet_ntop(su.su_family, SU_ADDR(&su), nbuf, sizeof(nbuf)), ntohs(su.su_sin.sin_port), buf, rtt / 1000); do_ping(p, p->t, NULL); @@ -237,7 +237,7 @@ if (opt_verbatim) printf("do_recv: %d bytes from [%s]:%u: \"%s\" at %s\n", - n, inet_ntop(su.su_family, SU_ADDR(&su), nbuf, sizeof(nbuf)), + n, su_inet_ntop(su.su_family, SU_ADDR(&su), nbuf, sizeof(nbuf)), ntohs(su.su_sin.sin_port), buf, snow(now)); fflush(stdout); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_su_osx.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_su_osx.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_su_osx.c Tue Jul 8 00:36:13 2008 @@ -127,7 +127,7 @@ if (opt_verbatim) printf("udpsocket: using address [%s]:%u\n", - inet_ntop(su.su_family, SU_ADDR(&su), nbuf, sizeof(nbuf)), + su_inet_ntop(su.su_family, SU_ADDR(&su), nbuf, sizeof(nbuf)), ntohs(su.su_sin.sin_port)); return s; @@ -202,7 +202,7 @@ if (opt_verbatim) printf("do_rtt: %d bytes from [%s]:%u: \"%s\", rtt = %lg ms\n", - n, inet_ntop(su.su_family, SU_ADDR(&su), nbuf, sizeof(nbuf)), + n, su_inet_ntop(su.su_family, SU_ADDR(&su), nbuf, sizeof(nbuf)), ntohs(su.su_sin.sin_port), buf, rtt / 1000); do_ping(p, p->t, NULL); @@ -260,7 +260,7 @@ if (opt_verbatim) printf("do_recv: %d bytes from [%s]:%u: \"%s\" at %s\n", - n, inet_ntop(su.su_family, SU_ADDR(&su), nbuf, sizeof(nbuf)), + n, su_inet_ntop(su.su_family, SU_ADDR(&su), nbuf, sizeof(nbuf)), ntohs(su.su_sin.sin_port), buf, snow(now)); fflush(stdout); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su.c Tue Jul 8 00:36:13 2008 @@ -177,7 +177,7 @@ memset(&su, 0, sulen); su.su_len = sulen; su.su_family = AF_INET; - TEST(inet_pton(AF_INET, "127.0.0.1", &su.su_sin.sin_addr), 1); + TEST(su_inet_pton(AF_INET, "127.0.0.1", &su.su_sin.sin_addr), 1); TEST(bind(s, &su.su_sa, sulen), 0); TEST(getsockname(s, &su.su_sa, &sulen), 0); @@ -197,7 +197,7 @@ memset(&su, 0, sulen); su.su_len = sulen; su.su_family = AF_INET; - TEST(inet_pton(AF_INET, "127.0.0.1", &su.su_sin.sin_addr), 1); + TEST(su_inet_pton(AF_INET, "127.0.0.1", &su.su_sin.sin_addr), 1); TEST(bind(l, &su.su_sa, sulen), 0); TEST(bind(s, &su.su_sa, sulen), 0); @@ -304,7 +304,7 @@ memset(&su, 0, sulen); su.su_len = sulen; su.su_family = AF_INET; - TEST(inet_pton(AF_INET, "127.0.0.1", &su.su_sin.sin_addr), 1); + TEST(su_inet_pton(AF_INET, "127.0.0.1", &su.su_sin.sin_addr), 1); TEST(bind(s, &su.su_sa, sulen), 0); TEST(getsockname(s, &su.su_sa, &sulen), 0); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_root.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_root.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_root.c Tue Jul 8 00:36:13 2008 @@ -239,9 +239,9 @@ TEST_1(su_wait_create(ep->wait, ep->s, SU_WAIT_IN|SU_WAIT_ERR) != -1); TEST_1(getsockname(ep->s, &ep->addr->su_sa, &ep->addrlen) != -1); if (SU_HAS_INADDR_ANY(ep->addr)) { - inet_pton(su->su_family, - su->su_family == AF_INET ? "127.0.0.1" : "::1", - SU_ADDR(ep->addr)); + su_inet_pton(su->su_family, + su->su_family == AF_INET ? "127.0.0.1" : "::1", + SU_ADDR(ep->addr)); } } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_root_osx.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_root_osx.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_root_osx.c Tue Jul 8 00:36:13 2008 @@ -108,9 +108,9 @@ TEST_1(su_wait_create(ep->wait, ep->s, SU_WAIT_IN|SU_WAIT_ERR) != -1); TEST_1(getsockname(ep->s, &ep->addr->su_sa, &ep->addrlen) != -1); if (SU_HAS_INADDR_ANY(ep->addr)) { - inet_pton(su->su_family, - su->su_family == AF_INET ? "127.0.0.1" : "::1", - SU_ADDR(ep->addr)); + su_inet_pton(su->su_family, + su->su_family == AF_INET ? "127.0.0.1" : "::1", + SU_ADDR(ep->addr)); } } 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 Jul 8 00:36:13 2008 @@ -3958,7 +3958,7 @@ #else SU_DEBUG_9(("tport_resolve addrinfo = %s%s%s:%d\n", "", - inet_ntop(su->su_family, SU_ADDR(su), ipaddr, sizeof(ipaddr)), + su_inet_ntop(su->su_family, SU_ADDR(su), ipaddr, sizeof(ipaddr)), "", htons(su->su_port))); #endif Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_stun.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_stun.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_stun.c Tue Jul 8 00:36:13 2008 @@ -197,7 +197,8 @@ SU_DEBUG_5(("%s: stun_bind() ok: local address NATed as %s:%u\n", __func__, - inet_ntop(su->su_family, SU_ADDR(su), ipname, sizeof(ipname)), + su_inet_ntop(su->su_family, SU_ADDR(su), + ipname, sizeof(ipname)), (unsigned) ntohs(su->su_port))); } 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 Tue Jul 8 00:36:13 2008 @@ -144,7 +144,7 @@ imr->imr_multiaddr = su->su_sin.sin_addr; if (host_is_ip4_address(tpn->tpn_canon) && - inet_pton(AF_INET, tpn->tpn_canon, &iface) > 0) { + su_inet_pton(AF_INET, tpn->tpn_canon, &iface) > 0) { imr->imr_interface = iface; } @@ -506,8 +506,8 @@ origin, info)); if (from->su_family != AF_UNSPEC) SU_DEBUG_3(("\treported by [%s]:%u\n", - inet_ntop(from->su_family, SU_ADDR(from), - info, sizeof(info)), + su_inet_ntop(from->su_family, SU_ADDR(from), + info, sizeof(info)), ntohs(from->su_port))); if (msg->msg_namelen == 0) Modified: freeswitch/trunk/libs/sofia-sip/tests/test_init.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/tests/test_init.c (original) +++ freeswitch/trunk/libs/sofia-sip/tests/test_init.c Tue Jul 8 00:36:13 2008 @@ -217,7 +217,7 @@ else if (su->su_family == AF_INET6) { a_uri = (void *) su_sprintf(ctx->home, "sip:[%s]:%u", - inet_ntop(su->su_family, SU_ADDR(su), b, sizeof b), + su_inet_ntop(su->su_family, SU_ADDR(su), b, sizeof b), ntohs(su->su_port)); a_bind = "sip:[::]:*"; } @@ -225,7 +225,7 @@ else if (su->su_family == AF_INET) { a_uri = (void *) su_sprintf(ctx->home, "sip:%s:%u", - inet_ntop(su->su_family, SU_ADDR(su), b, sizeof b), + su_inet_ntop(su->su_family, SU_ADDR(su), b, sizeof b), ntohs(su->su_port)); } @@ -234,15 +234,15 @@ su->su_len = sulen = (sizeof su->su_sin6), su->su_family = AF_INET6; len = strcspn(p_uri->url_host + 1, "]"); assert(len < sizeof b); memcpy(b, p_uri->url_host + 1, len); b[len] = '\0'; - inet_pton(su->su_family, b, SU_ADDR(su)); + su_inet_pton(su->su_family, b, SU_ADDR(su)); } else { su->su_len = sulen = (sizeof su->su_sin), su->su_family = AF_INET; - inet_pton(su->su_family, p_uri->url_host, SU_ADDR(su)); + su_inet_pton(su->su_family, p_uri->url_host, SU_ADDR(su)); } #else su->su_len = sulen = (sizeof su->su_sin), su->su_family = AF_INET; - inet_pton(su->su_family, p_uri->url_host, SU_ADDR(su)); + su_inet_pton(su->su_family, p_uri->url_host, SU_ADDR(su)); #endif su->su_port = htons(strtoul(url_port(p_uri), NULL, 10)); Modified: freeswitch/trunk/libs/sofia-sip/tests/test_nat.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/tests/test_nat.c (original) +++ freeswitch/trunk/libs/sofia-sip/tests/test_nat.c Tue Jul 8 00:36:13 2008 @@ -531,13 +531,13 @@ } getpeername(b->in_socket, (void *)addr, &addrlen); - inet_ntop(addr->su_family, SU_ADDR(addr), ipname, sizeof ipname); + su_inet_ntop(addr->su_family, SU_ADDR(addr), ipname, sizeof ipname); snprintf(b->in_name, sizeof b->in_name, addr->su_family == AF_INET6 ? "[%s]:%u" : "%s:%u", ipname, ntohs(addr->su_port)); getsockname(out_socket, (void *)addr, &addrlen); - inet_ntop(addr->su_family, SU_ADDR(addr), ipname, sizeof ipname); + su_inet_ntop(addr->su_family, SU_ADDR(addr), ipname, sizeof ipname); snprintf(b->out_name, sizeof b->out_name, addr->su_family == AF_INET6 ? "[%s]:%u" : "%s:%u", ipname, ntohs(addr->su_port)); @@ -617,7 +617,7 @@ size_t namelen; struct binding *b; - inet_ntop(from->su_family, SU_ADDR(from), ipname, sizeof ipname); + su_inet_ntop(from->su_family, SU_ADDR(from), ipname, sizeof ipname); snprintf(name, sizeof name, from->su_family == AF_INET6 ? "[%s]:%u" : "%s:%u", ipname, ntohs(from->su_port)); @@ -915,7 +915,7 @@ b->out_register = out_register; getsockname(out, (void *)addr, &addrlen); - inet_ntop(addr->su_family, SU_ADDR(addr), name, sizeof name); + su_inet_ntop(addr->su_family, SU_ADDR(addr), name, sizeof name); snprintf(b->out_name, sizeof b->out_name, addr->su_family == AF_INET6 ? "[%s]:%u" : "%s:%u", name, ntohs(addr->su_port)); Modified: freeswitch/trunk/libs/sofia-sip/utils/sip-dig.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/utils/sip-dig.c (original) +++ freeswitch/trunk/libs/sofia-sip/utils/sip-dig.c Tue Jul 8 00:36:13 2008 @@ -134,13 +134,6 @@ #include "config.h" -#if !defined(HAVE_WIN32) -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <arpa/inet.h> -#endif - #include "sofia-sip/su.h" #include "sofia-resolv/sres.h" @@ -803,7 +796,7 @@ if (answers[i]->sr_record->r_status != 0) continue; - inet_ntop(af, &answers[i]->sr_a->a_addr, addr, sizeof addr); + su_inet_ntop(af, &answers[i]->sr_a->a_addr, addr, sizeof addr); for (j = 0; tports[j].name; j++) { if (strcasecmp(tport, tports[j].name) == 0)

1 0

[commit] r8919 - freeswitch/trunk/libs/sofia-sip/win32/tests/test_nua
by Freeswitch SVN 08 Jul '08

08 Jul '08

Author: mikej Date: Tue Jul 8 00:35:02 2008 New Revision: 8919 Modified: freeswitch/trunk/libs/sofia-sip/win32/tests/test_nua/test_nua.dsp freeswitch/trunk/libs/sofia-sip/win32/tests/test_nua/test_nua.vcproj Log: Thu Jun 5 09:54:19 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * win32/tests/test_nua: fixed include paths Modified: freeswitch/trunk/libs/sofia-sip/win32/tests/test_nua/test_nua.dsp ============================================================================== --- freeswitch/trunk/libs/sofia-sip/win32/tests/test_nua/test_nua.dsp (original) +++ freeswitch/trunk/libs/sofia-sip/win32/tests/test_nua/test_nua.dsp Tue Jul 8 00:35:02 2008 @@ -42,7 +42,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /WX /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /c -# ADD CPP /nologo /MD /W3 /WX /GX /O2 /I "..\.." /I "..\..\..\libsofia-sip-ua\su" /I "..\..\..\libsofia-sip-ua\ipt" /I "..\..\..\libsofia-sip-ua\sresolv" /I "..\..\..\libsofia-sip-ua\bnf" /I "..\..\..\libsofia-sip-ua\url" /I "..\..\..\libsofia-sip-ua\msg" /I "..\..\..\libsofia-sip-ua\sip" /I "..\..\..\libsofia-sip-ua\nta" /I "..\..\..\libsofia-sip-ua\nua" /I "..\..\..\libsofia-sip-ua\iptsec" /I "..\..\..\libsofia-sip-ua\http" /I "..\..\..\libsofia-sip-ua\nth" /I "..\..\..\libsofia-sip-ua\nea" /I "..\..\..\libsofia-sip-ua\sdp" /I "..\..\..\libsofia-sip-ua\soa" /I "..\..\..\libsofia-sip-ua\stun" /I "..\..\..\libsofia-sip-ua\tport" /I "include" /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c +# ADD CPP /nologo /MD /W3 /WX /GX /O2 /I "..\.." /I "..\..\..\libsofia-sip-ua\su" /I "..\..\..\libsofia-sip-ua\ipt" /I "..\..\..\libsofia-sip-ua\sresolv" /I "..\..\..\libsofia-sip-ua\bnf" /I "..\..\..\libsofia-sip-ua\url" /I "..\..\..\libsofia-sip-ua\msg" /I "..\..\..\libsofia-sip-ua\sip" /I "..\..\..\libsofia-sip-ua\nta" /I "..\..\..\libsofia-sip-ua\nua" /I "..\..\..\libsofia-sip-ua\iptsec" /I "..\..\..\libsofia-sip-ua\http" /I "..\..\..\libsofia-sip-ua\nth" /I "..\..\..\libsofia-sip-ua\nea" /I "..\..\..\libsofia-sip-ua\sdp" /I "..\..\..\libsofia-sip-ua\soa" /I "..\..\..\libsofia-sip-ua\stun" /I "..\..\..\libsofia-sip-ua\tport" /I "..\..\..\tests" /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +66,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /WX /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /WX /Gm /GX /ZI /Od /I "..\.." /I "..\..\..\libsofia-sip-ua\su" /I "..\..\..\libsofia-sip-ua\ipt" /I "..\..\..\libsofia-sip-ua\sresolv" /I "..\..\..\libsofia-sip-ua\bnf" /I "..\..\..\libsofia-sip-ua\url" /I "..\..\..\libsofia-sip-ua\msg" /I "..\..\..\libsofia-sip-ua\sip" /I "..\..\..\libsofia-sip-ua\nta" /I "..\..\..\libsofia-sip-ua\nua" /I "..\..\..\libsofia-sip-ua\iptsec" /I "..\..\..\libsofia-sip-ua\http" /I "..\..\..\libsofia-sip-ua\nth" /I "..\..\..\libsofia-sip-ua\nea" /I "..\..\..\libsofia-sip-ua\sdp" /I "..\..\..\libsofia-sip-ua\soa" /I "..\..\..\libsofia-sip-ua\stun" /I "..\..\..\libsofia-sip-ua\tport" /I "include" /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /WX /Gm /GX /ZI /Od /I "..\.." /I "..\..\..\libsofia-sip-ua\su" /I "..\..\..\libsofia-sip-ua\ipt" /I "..\..\..\libsofia-sip-ua\sresolv" /I "..\..\..\libsofia-sip-ua\bnf" /I "..\..\..\libsofia-sip-ua\url" /I "..\..\..\libsofia-sip-ua\msg" /I "..\..\..\libsofia-sip-ua\sip" /I "..\..\..\libsofia-sip-ua\nta" /I "..\..\..\libsofia-sip-ua\nua" /I "..\..\..\libsofia-sip-ua\iptsec" /I "..\..\..\libsofia-sip-ua\http" /I "..\..\..\libsofia-sip-ua\nth" /I "..\..\..\libsofia-sip-ua\nea" /I "..\..\..\libsofia-sip-ua\sdp" /I "..\..\..\libsofia-sip-ua\soa" /I "..\..\..\libsofia-sip-ua\stun" /I "..\..\..\libsofia-sip-ua\tport" /I "..\..\..\tests" /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" Modified: freeswitch/trunk/libs/sofia-sip/win32/tests/test_nua/test_nua.vcproj ============================================================================== --- freeswitch/trunk/libs/sofia-sip/win32/tests/test_nua/test_nua.vcproj (original) +++ freeswitch/trunk/libs/sofia-sip/win32/tests/test_nua/test_nua.vcproj Tue Jul 8 00:35:02 2008 @@ -44,7 +44,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..,..\..\..\libsofia-sip-ua\su,..\..\..\libsofia-sip-ua\ipt,..\..\..\libsofia-sip-ua\sresolv,..\..\..\libsofia-sip-ua\bnf,..\..\..\libsofia-sip-ua\url,..\..\..\libsofia-sip-ua\msg,..\..\..\libsofia-sip-ua\sip,..\..\..\libsofia-sip-ua\nta,..\..\..\libsofia-sip-ua\nua,..\..\..\libsofia-sip-ua\iptsec,..\..\..\libsofia-sip-ua\http,..\..\..\libsofia-sip-ua\nth,..\..\..\libsofia-sip-ua\nea,..\..\..\libsofia-sip-ua\sdp,..\..\..\libsofia-sip-ua\soa,..\..\..\libsofia-sip-ua\stun,..\..\..\libsofia-sip-ua\tport,include,." + AdditionalIncludeDirectories="..\..,..\..\..\libsofia-sip-ua\su,..\..\..\libsofia-sip-ua\ipt,..\..\..\libsofia-sip-ua\sresolv,..\..\..\libsofia-sip-ua\bnf,..\..\..\libsofia-sip-ua\url,..\..\..\libsofia-sip-ua\msg,..\..\..\libsofia-sip-ua\sip,..\..\..\libsofia-sip-ua\nta,..\..\..\libsofia-sip-ua\nua,..\..\..\libsofia-sip-ua\iptsec,..\..\..\libsofia-sip-ua\http,..\..\..\libsofia-sip-ua\nth,..\..\..\libsofia-sip-ua\nea,..\..\..\libsofia-sip-ua\sdp,..\..\..\libsofia-sip-ua\soa,..\..\..\libsofia-sip-ua\stun,..\..\..\libsofia-sip-ua\tport,..\..\..\tests,." PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -140,7 +140,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..,..\..\..\libsofia-sip-ua\su,..\..\..\libsofia-sip-ua\ipt,..\..\..\libsofia-sip-ua\sresolv,..\..\..\libsofia-sip-ua\bnf,..\..\..\libsofia-sip-ua\url,..\..\..\libsofia-sip-ua\msg,..\..\..\libsofia-sip-ua\sip,..\..\..\libsofia-sip-ua\nta,..\..\..\libsofia-sip-ua\nua,..\..\..\libsofia-sip-ua\iptsec,..\..\..\libsofia-sip-ua\http,..\..\..\libsofia-sip-ua\nth,..\..\..\libsofia-sip-ua\nea,..\..\..\libsofia-sip-ua\sdp,..\..\..\libsofia-sip-ua\soa,..\..\..\libsofia-sip-ua\stun,..\..\..\libsofia-sip-ua\tport,include,." + AdditionalIncludeDirectories="..\..,..\..\..\libsofia-sip-ua\su,..\..\..\libsofia-sip-ua\ipt,..\..\..\libsofia-sip-ua\sresolv,..\..\..\libsofia-sip-ua\bnf,..\..\..\libsofia-sip-ua\url,..\..\..\libsofia-sip-ua\msg,..\..\..\libsofia-sip-ua\sip,..\..\..\libsofia-sip-ua\nta,..\..\..\libsofia-sip-ua\nua,..\..\..\libsofia-sip-ua\iptsec,..\..\..\libsofia-sip-ua\http,..\..\..\libsofia-sip-ua\nth,..\..\..\libsofia-sip-ua\nea,..\..\..\libsofia-sip-ua\sdp,..\..\..\libsofia-sip-ua\soa,..\..\..\libsofia-sip-ua\stun,..\..\..\libsofia-sip-ua\tport,..\..\..\tests,." PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" StringPooling="true" RuntimeLibrary="2"

1 0

[commit] r8918 - freeswitch/trunk/src/mod/xml_int/mod_xml_curl
by Freeswitch SVN 08 Jul '08

08 Jul '08

Author: mikej Date: Tue Jul 8 00:07:53 2008 New Revision: 8918 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Log: add reload, fix leak in failure cases (MDXMLINT-27) Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Tue Jul 8 00:07:53 2008 @@ -44,7 +44,6 @@ int disable100continue; uint32_t ignore_cacert_check; switch_hash_t *vars_map; - switch_memory_pool_t *vars_map_pool; }; static int keep_files_around = 0; @@ -56,6 +55,17 @@ int fd; }; +typedef struct hash_node { + switch_hash_t* hash; + struct hash_node* next; +} hash_node_t; + +static struct { + switch_memory_pool_t* pool; + hash_node_t* hash_root; + hash_node_t* hash_tail; +} globals; + #define XML_CURL_SYNTAX "[debug_on|debug_off]" SWITCH_STANDARD_API(xml_curl_function) { @@ -212,7 +222,6 @@ int x = 0; int need_vars_map = 0; switch_hash_t *vars_map = NULL; - switch_memory_pool_t *vars_map_pool = NULL; if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); @@ -231,6 +240,9 @@ char *bind_mask = NULL; int disable100continue = 0; uint32_t ignore_cacert_check = 0; + hash_node_t* hash_node; + need_vars_map = 0; + vars_map = NULL; for (param = switch_xml_child(binding_tag, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); @@ -248,15 +260,8 @@ ignore_cacert_check = 1; } else if (!strcasecmp(var, "enable-post-var")) { if (!vars_map && need_vars_map == 0) { - if (switch_core_new_memory_pool(&vars_map_pool) != SWITCH_STATUS_SUCCESS) { - need_vars_map = -1; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cant create memory pool!\n"); - continue; - } - - if (switch_core_hash_init(&vars_map, vars_map_pool) != SWITCH_STATUS_SUCCESS) { + if (switch_core_hash_init(&vars_map, globals.pool) != SWITCH_STATUS_SUCCESS) { need_vars_map = -1; - switch_core_destroy_memory_pool(&vars_map_pool); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cant init params hash!\n"); continue; } @@ -267,16 +272,19 @@ if (switch_core_hash_insert(vars_map, val, ENABLE_PARAM_VALUE) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cant add %s to params hash!\n", val); } - } } if (!url) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Binding has no url!\n"); + if (vars_map) + switch_core_hash_destroy(&vars_map); continue; } if (!(binding = malloc(sizeof(*binding)))) { + if (vars_map) + switch_core_hash_destroy(&vars_map); goto done; } memset(binding, 0, sizeof(*binding)); @@ -295,7 +303,23 @@ binding->ignore_cacert_check = ignore_cacert_check; binding->vars_map = vars_map; - binding->vars_map_pool = vars_map_pool; + + if(vars_map) { + switch_zmalloc(hash_node,sizeof(hash_node_t)); + hash_node->hash = vars_map; + hash_node->next = NULL; + + if(!globals.hash_root) { + globals.hash_root = hash_node; + globals.hash_tail = globals.hash_root; + } + + else { + globals.hash_tail->next = hash_node; + globals.hash_tail = globals.hash_tail->next; + } + + } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Binding [%s] XML Fetch Function [%s] [%s]\n", switch_strlen_zero(bname) ? "N/A" : bname, binding->url, binding->bindings ? binding->bindings : "all"); @@ -321,6 +345,10 @@ switch_console_set_complete("add xml_curl debug_on"); switch_console_set_complete("add xml_curl debug_off"); + memset(&globals,0,sizeof(globals)); + globals.pool = pool; + globals.hash_root = NULL; + globals.hash_tail = NULL; if (do_config() == SWITCH_STATUS_SUCCESS) { curl_global_init(CURL_GLOBAL_ALL); @@ -334,6 +362,16 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_curl_shutdown) { + hash_node_t* ptr = NULL; + + while(globals.hash_root) { + ptr = globals.hash_root; + switch_core_hash_destroy(&ptr->hash); + globals.hash_root = ptr->next; + switch_safe_free(ptr); + } + + switch_xml_unbind_search_function_ptr(xml_url_fetch); curl_global_cleanup(); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r8917 - freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx
by Freeswitch SVN 08 Jul '08

08 Jul '08

Author: brian Date: Tue Jul 8 00:07:46 2008 New Revision: 8917 Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Log: dont freak on reinit if same args passed Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Tue Jul 8 00:07:46 2008 @@ -116,7 +116,7 @@ switch_assert(lm && dic && model); - ps->config = cmd_ln_init(ps->config, ps_args(), TRUE, + ps->config = cmd_ln_init(ps->config, ps_args(), FALSE, "-samprate", "8000", "-hmm", model, "-lm", lm,

1 0

[commit] r8916 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 08 Jul '08

08 Jul '08

Author: mikej Date: Mon Jul 7 23:52:13 2008 New Revision: 8916 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: auto-record parameter enhancement (MODAPP-112) Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Mon Jul 7 23:52:13 2008 @@ -27,7 +27,7 @@ * Neal Horman <neal at wanlink dot com> * Bret McDanel <trixter at 0xdecafbad dot com> * Dale Thatcher <freeswitch at dalethatcher dot com> - * + * Chris Danielson <chris at maxpowersoft dot com> * * mod_conference.c -- Software Conference Bridge * @@ -230,6 +230,7 @@ char *caller_id_number; char *sound_prefix; char *special_announce; + char *auto_record; uint32_t max_members; char *maxmember_sound; uint32_t anounce_count; @@ -880,6 +881,21 @@ switch_mutex_lock(globals.hash_mutex); globals.threads++; switch_mutex_unlock(globals.hash_mutex); + + if (conference->auto_record) { + imember = conference->members; + if (imember) { + switch_channel_t *channel = switch_core_session_get_channel(imember->session); + char *rfile = switch_channel_expand_variables(channel, conference->auto_record); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Auto recording file: %s\n", rfile); + launch_conference_record_thread(conference, rfile); + if (rfile != conference->auto_record) { + switch_safe_free(rfile); + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Auto Record Failed. No members in conference.\n"); + } + } while (globals.running && !switch_test_flag(conference, CFLAG_DESTRUCT)) { switch_size_t file_sample_len = samples; @@ -4258,6 +4274,8 @@ goto done; } + switch_channel_set_variable(channel, "conference-name", conference->name); + /* Set the minimum number of members (once you go above it you cannot go below it) */ conference->min = 2; @@ -4287,6 +4305,8 @@ if (dpin) { conference->pin = switch_core_strdup(conference->pool, dpin); } + + switch_channel_set_variable(channel, "conference-name", conference->name); /* Set the minimum number of members (once you go above it you cannot go below it) */ conference->min = 1; @@ -4296,6 +4316,8 @@ /* Start the conference thread for this conference */ launch_conference_thread(conference); + } else { /* setup user variable */ + switch_channel_set_variable(channel, "conference-name", conference->name); } /* acquire a read lock on the thread so it can't leave without us */ @@ -4806,6 +4828,7 @@ switch_status_t status; int comfort_noise_level = 0; char *suppress_events = NULL; + char *auto_record = NULL; /* Validate the conference name */ if (switch_strlen_zero(name)) { @@ -4923,6 +4946,8 @@ } } else if (!strcasecmp(var, "suppress-events") && !switch_strlen_zero(val)) { suppress_events = val; + } else if (!strcasecmp(var, "auto-record") && !switch_strlen_zero(val)) { + auto_record = val; } } @@ -5078,6 +5103,10 @@ clear_eflags(suppress_events, &conference->eflags); } + if (!switch_strlen_zero(auto_record)) { + conference->auto_record = switch_core_strdup(conference->pool, auto_record); + } + /* caller control configuration chores */ if (switch_ivr_digit_stream_parser_new(conference->pool, &conference->dtmf_parser) == SWITCH_STATUS_SUCCESS) {

1 0

[commit] r8915 - freeswitch/trunk/src/mod/languages/mod_python
by Freeswitch SVN 08 Jul '08

08 Jul '08

Author: anthm Date: Mon Jul 7 23:25:31 2008 New Revision: 8915 Modified: freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp Log: don't override macro name (MODLANG-68) Modified: freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp Mon Jul 7 23:25:31 2008 @@ -1,21 +1,21 @@ #include "freeswitch_python.h" #define sanity_check(x) do { if (!session) { switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "session is not initalized\n"); return x;}} while(0) -#define init_vars() do { caller_profile.source = "mod_python"; swapstate = S_SWAPPED_IN; } while(0) +#define py_init_vars() do { caller_profile.source = "mod_python"; swapstate = S_SWAPPED_IN; } while(0) PySession::PySession():CoreSession() { - init_vars(); + py_init_vars(); } PySession::PySession(char *uuid):CoreSession(uuid) { - init_vars(); + py_init_vars(); } PySession::PySession(switch_core_session_t *new_session):CoreSession(new_session) { - init_vars(); + py_init_vars(); }

1 0

[commit] r8914 - in freeswitch/trunk/src: . mod/languages/mod_spidermonkey_odbc
by Freeswitch SVN 08 Jul '08

08 Jul '08

Author: mikej Date: Mon Jul 7 23:06:07 2008 New Revision: 8914 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c freeswitch/trunk/src/switch_odbc.c Log: fix Misuse of SQLRowCount, issues with MSSQL (MODAPP-105) Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c Mon Jul 7 23:06:07 2008 @@ -359,46 +359,45 @@ } if (odbc_obj->stmt) { - SQLSMALLINT c = 0, x = 0; - SQLLEN m = 0; + SQLSMALLINT nColumns = 0, x = 0; eval_some_js("~var _oDbC_dB_RoW_DaTa_ = {}", cx, obj, rval); if (*rval == JS_FALSE) { return JS_TRUE; } - SQLNumResultCols(odbc_obj->stmt, &c); - SQLRowCount(odbc_obj->stmt, &m); - if (m > 0) { - for (x = 1; x <= c; x++) { - SQLSMALLINT NameLength, DataType, DecimalDigits, Nullable; - SQLULEN ColumnSize; - SQLCHAR name[1024] = ""; - SQLCHAR *data = odbc_obj->colbuf; - SQLCHAR *esc = NULL; - - SQLDescribeCol(odbc_obj->stmt, x, name, sizeof(name), &NameLength, &DataType, &ColumnSize, &DecimalDigits, &Nullable); - SQLGetData(odbc_obj->stmt, x, SQL_C_CHAR, odbc_obj->colbuf, odbc_obj->cblen, NULL); - - if (strchr((char *) odbc_obj->colbuf, '"')) { /* please don't */ - esc = (SQLCHAR *) escape_data((char *) odbc_obj->colbuf, '\\'); - data = esc; - } - - switch_snprintf((char *) odbc_obj->code, odbc_obj->codelen, "~_oDbC_dB_RoW_DaTa_[\"%s\"] = \"%s\"", name, data); - switch_safe_free(esc); - - eval_some_js((char *) odbc_obj->code, cx, obj, rval); - - if (*rval == JS_FALSE) { - return JS_TRUE; - } + if ( SQLNumResultCols( odbc_obj->stmt, &nColumns ) != SQL_SUCCESS ) + return JS_FALSE; + + for (x = 1; x <= nColumns; x++) { + SQLSMALLINT NameLength, DataType, DecimalDigits, Nullable; + SQLULEN ColumnSize; + SQLCHAR name[1024] = ""; + SQLCHAR *data = odbc_obj->colbuf; + SQLCHAR *esc = NULL; + + SQLDescribeCol(odbc_obj->stmt, x, name, sizeof(name), &NameLength, &DataType, &ColumnSize, &DecimalDigits, &Nullable); + SQLGetData(odbc_obj->stmt, x, SQL_C_CHAR, odbc_obj->colbuf, odbc_obj->cblen, NULL); + + if (strchr((char *) odbc_obj->colbuf, '"')) { /* please don't */ + esc = (SQLCHAR *) escape_data((char *) odbc_obj->colbuf, '\\'); + data = esc; } - JS_GetProperty(cx, obj, "_oDbC_dB_RoW_DaTa_", rval); - return JS_TRUE; + switch_snprintf((char *) odbc_obj->code, odbc_obj->codelen, "~_oDbC_dB_RoW_DaTa_[\"%s\"] = \"%s\"", name, data); + switch_safe_free(esc); + + eval_some_js((char *) odbc_obj->code, cx, obj, rval); + + if (*rval == JS_FALSE) { + return JS_TRUE; + } } + JS_GetProperty(cx, obj, "_oDbC_dB_RoW_DaTa_", rval); + return JS_TRUE; + + } done: Modified: freeswitch/trunk/src/switch_odbc.c ============================================================================== --- freeswitch/trunk/src/switch_odbc.c (original) +++ freeswitch/trunk/src/switch_odbc.c Mon Jul 7 23:06:07 2008 @@ -196,6 +196,9 @@ SQLCHAR sql[255] = ""; int max_tries = 120; + SQLRETURN rc; + SQLSMALLINT nresultcols; + top: if (!handle) { @@ -219,10 +222,15 @@ result = SQLExecute(stmt); - SQLRowCount(stmt, &m); - ret = (int) m; - - if (result < 0 || m < 0) { + SQLRowCount (stmt, &m); + rc = SQLNumResultCols (stmt, &nresultcols); + if (rc != SQL_SUCCESS){ + goto error; + } + ret = (int) nresultcols; + /* determine statement type */ + if (nresultcols <= 0) { + /* statement is not a select statement */ goto error; }

1 0

[commit] r8913 - freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx
by Freeswitch SVN 07 Jul '08

07 Jul '08

Author: anthm Date: Mon Jul 7 18:09:19 2008 New Revision: 8913 Added: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Log: add mod_pocketsphinx Added: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile Mon Jul 7 18:09:19 2008 @@ -0,0 +1,4 @@ +LOCAL_CFLAGS=`PKG_CONFIG_PATH=/usr/local/lib/pkgconfig pkg-config --cflags pocketsphinx sphinxbase` +LOCAL_LDFLAGS=`PKG_CONFIG_PATH=/usr/local/lib/pkgconfig pkg-config --libs pocketsphinx sphinxbase` +BASE=../../../.. +include $(BASE)/build/modmake.rules Added: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Mon Jul 7 18:09:19 2008 @@ -0,0 +1,396 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Brian West <brian(a)freeswitch.org> + * + * mod_pocketsphinx - Pocket Sphinx + * + * + */ + +#include <switch.h> +#include <pocketsphinx.h> +#define MODELDIR "/usr/local/share/pocketsphinx/model" + +SWITCH_MODULE_LOAD_FUNCTION(mod_pocketsphinx_load); +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_pocketsphinx_shutdown); +SWITCH_MODULE_DEFINITION(mod_pocketsphinx, mod_pocketsphinx_load, mod_pocketsphinx_shutdown, NULL); + +static struct { + char *model; +} globals; + +typedef enum { + PSFLAG_HAS_TEXT = (1 << 0), + PSFLAG_READY = (1 << 1), + PSFLAG_BARGE = (1 << 2), + PSFLAG_ALLOCATED = (1 << 3) +} psflag_t; + +typedef struct { + ps_decoder_t *ps; + uint32_t flags; + switch_mutex_t *flag_mutex; + uint32_t org_silence_hits; + uint32_t thresh; + uint32_t silence_hits; + uint32_t listen_hits; + uint32_t listening; + uint32_t countdown; + char *hyp; + char *grammar; + int32_t score; + cmd_ln_t *config; +} pocketsphinx_t; + +/*! function to open the asr interface */ +static switch_status_t pocketsphinx_asr_open(switch_asr_handle_t *ah, const char *codec, int rate, const char *dest, switch_asr_flag_t *flags) +{ + + pocketsphinx_t *ps; + + if (!(ps = (pocketsphinx_t *) switch_core_alloc(ah->memory_pool, sizeof(*ps)))) { + return SWITCH_STATUS_MEMERR; + } + + + switch_mutex_init(&ps->flag_mutex, SWITCH_MUTEX_NESTED, ah->memory_pool); + ah->private_info = ps; + + codec = "L16"; + ah->rate = 8000; + ah->codec = switch_core_strdup(ah->memory_pool, codec); + + + ps->thresh = 400; + ps->silence_hits = 35; + ps->org_silence_hits = ps->silence_hits; + ps->listen_hits = 5; + + return SWITCH_STATUS_SUCCESS; +} + +/*! function to load a grammar to the asr interface */ +static switch_status_t pocketsphinx_asr_load_grammar(switch_asr_handle_t *ah, const char *grammar, const char *path) +{ + char *lm, *dic, *model; + pocketsphinx_t *ps = (pocketsphinx_t *) ah->private_info; + switch_status_t status = SWITCH_STATUS_FALSE; + + if (switch_test_flag(ps, PSFLAG_READY)) { + ps_end_utt(ps->ps); + switch_clear_flag(ps, PSFLAG_READY); + } + + if (switch_is_file_path(grammar)) { + lm = switch_mprintf("%s%s%s.lm", grammar, SWITCH_PATH_SEPARATOR, grammar); + dic = switch_mprintf("%s%s%s.dic", grammar, SWITCH_PATH_SEPARATOR, grammar); + } else { + lm = switch_mprintf("%s%s%s%s%s.lm", SWITCH_GLOBAL_dirs.grammar_dir, SWITCH_PATH_SEPARATOR, grammar, SWITCH_PATH_SEPARATOR, grammar); + dic = switch_mprintf("%s%s%s%s%s.dic", SWITCH_GLOBAL_dirs.grammar_dir, SWITCH_PATH_SEPARATOR, grammar, SWITCH_PATH_SEPARATOR, grammar); + } + + model = switch_mprintf("%s%smodel%s%s", SWITCH_GLOBAL_dirs.grammar_dir, SWITCH_PATH_SEPARATOR, SWITCH_PATH_SEPARATOR, globals.model); + + switch_assert(lm && dic && model); + + ps->config = cmd_ln_init(ps->config, ps_args(), TRUE, + "-samprate", "8000", + "-hmm", model, + "-lm", lm, + "-dict", dic, + NULL); + + if (ps->config == NULL) { + return SWITCH_STATUS_GENERR; + } + + switch_mutex_lock(ps->flag_mutex); + if (switch_test_flag(ps, PSFLAG_ALLOCATED)) { + ps_reinit(ps->ps, ps->config); + } else { + if (!(ps->ps = ps_init(ps->config))) { + switch_mutex_unlock(ps->flag_mutex); + goto end; + } + switch_set_flag(ps, PSFLAG_ALLOCATED); + } + switch_mutex_unlock(ps->flag_mutex); + + ps_start_utt(ps->ps, NULL); + switch_set_flag(ps, PSFLAG_READY); + switch_safe_free(ps->grammar); + ps->grammar = strdup(grammar); + + status = SWITCH_STATUS_SUCCESS; + + end: + + + switch_safe_free(lm); + switch_safe_free(dic); + switch_safe_free(model); + + return status; +} + +/*! function to unload a grammar to the asr interface */ +static switch_status_t pocketsphinx_asr_unload_grammar(switch_asr_handle_t *ah, const char *grammar) +{ + // not sure an unload exists. + return SWITCH_STATUS_SUCCESS; +} + +/*! function to close the asr interface */ +static switch_status_t pocketsphinx_asr_close(switch_asr_handle_t *ah, switch_asr_flag_t *flags) +{ + char const *hyp, *uttid; + int32_t score; + pocketsphinx_t *ps = (pocketsphinx_t *) ah->private_info; + + switch_mutex_lock(ps->flag_mutex); + if (switch_test_flag(ps, PSFLAG_ALLOCATED)) { + if (switch_test_flag(ps, PSFLAG_READY)) { + ps_end_utt(ps->ps); + hyp = ps_get_hyp(ps->ps, &score, &uttid); + } + ps_free(ps->ps); + ps->ps = NULL; + } + switch_safe_free(ps->grammar); + switch_mutex_unlock(ps->flag_mutex); + switch_clear_flag(ps, PSFLAG_HAS_TEXT); + switch_clear_flag(ps, PSFLAG_READY); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Port Closed.\n"); + switch_set_flag(ah, SWITCH_ASR_FLAG_CLOSED); + return SWITCH_STATUS_SUCCESS; +} + +static switch_bool_t stop_detect(pocketsphinx_t *ps, int16_t *data, unsigned int samples) +{ + uint32_t score, count = 0, j = 0; + double energy = 0; + + if (ps->countdown) { + if (!--ps->countdown) { + ps->silence_hits = ps->org_silence_hits; + ps->listening = 0; + return SWITCH_TRUE; + } + return SWITCH_FALSE; + } + + + for (count = 0; count < samples; count++) { + energy += abs(data[j]); + } + + score = (uint32_t) (energy / samples); + + if (score >= ps->thresh) { + if (++ps->listening == 1) { + switch_set_flag_locked(ps, PSFLAG_BARGE); + } + } + + if (ps->listening > ps->listen_hits && score < ps->thresh) { + if (!--ps->silence_hits) { + ps->countdown = 12; + } + } else { + ps->silence_hits = ps->org_silence_hits; + } + + + return SWITCH_FALSE; +} + + +/*! function to feed audio to the ASR */ +static switch_status_t pocketsphinx_asr_feed(switch_asr_handle_t *ah, void *data, unsigned int len, switch_asr_flag_t *flags) +{ + // we really should put ps_start_utt(ps->ps, NULL); here when we start to feed it. + pocketsphinx_t *ps = (pocketsphinx_t *) ah->private_info; + int rv = 0; + + if (switch_test_flag(ah, SWITCH_ASR_FLAG_CLOSED)) return SWITCH_STATUS_BREAK; + + if (!switch_test_flag(ps, PSFLAG_HAS_TEXT) && switch_test_flag(ps, PSFLAG_READY)) { + + switch_mutex_lock(ps->flag_mutex); + rv = ps_process_raw(ps->ps, (int16 *)data, len / 2 , FALSE, FALSE); + switch_mutex_unlock(ps->flag_mutex); + + if (rv < 0) { + return SWITCH_STATUS_FALSE; + } + + if (stop_detect(ps, (int16_t *)data, len / 2)) { + char const *hyp, *uttid; + + switch_mutex_lock(ps->flag_mutex); + if ((hyp = ps_get_hyp(ps->ps, &ps->score, &uttid))) { + if (!switch_strlen_zero(hyp)) { + ps_end_utt(ps->ps); + switch_clear_flag(ps, PSFLAG_READY); + if ((hyp = ps_get_hyp(ps->ps, &ps->score, &uttid))) { + if (switch_strlen_zero(hyp)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Lost the text, nevermind....\n"); + ps_start_utt(ps->ps, NULL); + switch_set_flag(ps, PSFLAG_READY); + } else { + ps->hyp = switch_core_strdup(ah->memory_pool, hyp); + switch_set_flag(ps, PSFLAG_HAS_TEXT); + } + } + } + } + switch_mutex_unlock(ps->flag_mutex); + } + } + + return SWITCH_STATUS_SUCCESS; +} + +/*! funciton to pause recognizer */ +static switch_status_t pocketsphinx_asr_pause(switch_asr_handle_t *ah) +{ + pocketsphinx_t *ps = (pocketsphinx_t *) ah->private_info; + switch_status_t status = SWITCH_STATUS_FALSE; + + switch_mutex_lock(ps->flag_mutex); + if (switch_test_flag(ps, PSFLAG_READY)) { + ps_end_utt(ps->ps); + switch_clear_flag(ps, PSFLAG_READY); + status = SWITCH_STATUS_SUCCESS; + } + switch_mutex_unlock(ps->flag_mutex); + + return status; +} + +/*! function to resume recognizer */ +static switch_status_t pocketsphinx_asr_resume(switch_asr_handle_t *ah) +{ + pocketsphinx_t *ps = (pocketsphinx_t *) ah->private_info; + switch_status_t status = SWITCH_STATUS_FALSE; + + switch_mutex_lock(ps->flag_mutex); + switch_clear_flag(ps, PSFLAG_HAS_TEXT); + if (!switch_test_flag(ps, PSFLAG_READY)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Manually Resuming\n"); + + if (ps_start_utt(ps->ps, NULL)) { + status = SWITCH_STATUS_GENERR; + } else { + switch_set_flag(ps, PSFLAG_READY); + } + } + switch_mutex_unlock(ps->flag_mutex); + + + return status; +} + +/*! function to read results from the ASR*/ +static switch_status_t pocketsphinx_asr_check_results(switch_asr_handle_t *ah, switch_asr_flag_t *flags) +{ + pocketsphinx_t *ps = (pocketsphinx_t *) ah->private_info; + + return (switch_test_flag(ps, PSFLAG_HAS_TEXT) || switch_test_flag(ps, PSFLAG_BARGE)) ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; +} + +/*! function to read results from the ASR*/ +static switch_status_t pocketsphinx_asr_get_results(switch_asr_handle_t *ah, char **xmlstr, switch_asr_flag_t *flags) +{ + pocketsphinx_t *ps = (pocketsphinx_t *) ah->private_info; + switch_status_t status = SWITCH_STATUS_SUCCESS; + + if (switch_test_flag(ps, PSFLAG_BARGE)) { + switch_clear_flag_locked(ps, PSFLAG_BARGE); + status = SWITCH_STATUS_BREAK; + } + + if (switch_test_flag(ps, PSFLAG_HAS_TEXT)) { + switch_mutex_lock(ps->flag_mutex); + switch_clear_flag(ps, PSFLAG_HAS_TEXT); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Recognized: %s, Score: %d\n", ps->hyp, ps->score); + switch_mutex_unlock(ps->flag_mutex); + //*xmlstr = strdup((char *)ps->hyp ); + + *xmlstr = switch_mprintf("<interpretation grammar=\"%s\" score=\"%d\">\n" + " <result name=\"%s\">%s</result>\n" + " <input>%s</input>\n" + "</interpretation>", + + ps->grammar, ps->score, + "match", + ps->hyp, + ps->hyp + ); + + + if (switch_test_flag(ps, SWITCH_ASR_FLAG_AUTO_RESUME)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Auto Resuming\n"); + switch_set_flag(ps, PSFLAG_READY); + + ps_start_utt(ps->ps, NULL); + } + + status = SWITCH_STATUS_SUCCESS; + } + + + return status; +} + +SWITCH_MODULE_LOAD_FUNCTION(mod_pocketsphinx_load) +{ + switch_asr_interface_t *asr_interface; + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = switch_loadable_module_create_module_interface(pool, modname); + + asr_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ASR_INTERFACE); + asr_interface->interface_name = "pocketsphinx"; + asr_interface->asr_open = pocketsphinx_asr_open; + asr_interface->asr_load_grammar = pocketsphinx_asr_load_grammar; + asr_interface->asr_unload_grammar = pocketsphinx_asr_unload_grammar; + asr_interface->asr_close = pocketsphinx_asr_close; + asr_interface->asr_feed = pocketsphinx_asr_feed; + asr_interface->asr_resume = pocketsphinx_asr_resume; + asr_interface->asr_pause = pocketsphinx_asr_pause; + asr_interface->asr_check_results = pocketsphinx_asr_check_results; + asr_interface->asr_get_results = pocketsphinx_asr_get_results; + + globals.model = switch_core_strdup(pool, "communicator"); + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_pocketsphinx_shutdown) +{ + return SWITCH_STATUS_UNLOAD; +}

1 0

[commit] r8912 - freeswitch/trunk/src
by Freeswitch SVN 07 Jul '08

07 Jul '08

Author: anthm Date: Mon Jul 7 18:07:00 2008 New Revision: 8912 Modified: freeswitch/trunk/src/switch_ivr_async.c Log: tweak Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Mon Jul 7 18:07:00 2008 @@ -1518,6 +1518,49 @@ goto done; } + if (status == SWITCH_STATUS_SUCCESS && switch_true(switch_channel_get_variable(channel, "asr_intercept_dtmf"))) { + const char *p; + + if ((p = switch_stristr("<input>", xmlstr))) { + p += 7; + } + + while(p && *p) { + char c; + + if (*p == '<') { + break; + } + + if (!strncasecmp(p, "pound", 5)) { + c = '#'; + p += 5; + } else if (!strncasecmp(p, "hash", 4)) { + c = '#'; + p += 4; + } else if (!strncasecmp(p, "star", 4)) { + c = '*'; + p += 4; + } else if (!strncasecmp(p, "asterisk", 8)) { + c = '*'; + p += 8; + } else { + c = *p; + p++; + } + + if (is_dtmf(c)) { + switch_dtmf_t dtmf; + dtmf.digit = c; + dtmf.duration = switch_core_default_dtmf_duration(0); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Queue speech detected dtmf %c\n", c); + switch_channel_queue_dtmf(channel, &dtmf); + } + + } + switch_ivr_resume_detect_speech(sth->session); + } + if (switch_event_create(&event, SWITCH_EVENT_DETECTED_SPEECH) == SWITCH_STATUS_SUCCESS) { if (status == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Speech-Type", "detected-speech");

1 0

[commit] r8911 - freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig
by Freeswitch SVN 07 Jul '08

07 Jul '08

Author: anthm Date: Mon Jul 7 15:33:23 2008 New Revision: 8911 Added: freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_switch_event_node_t.java freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_switch_event_types_t.java freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_switch_queue_t.java Log: add missing mod_java files Added: freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_switch_event_node_t.java ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_switch_event_node_t.java Mon Jul 7 15:33:23 2008 @@ -0,0 +1,26 @@ +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org) + * Version 1.3.35 + * + * Do not make changes to this file unless you know what you are doing--modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + +package org.freeswitch.swig; + +public class SWIGTYPE_p_switch_event_node_t { + private long swigCPtr; + + protected SWIGTYPE_p_switch_event_node_t(long cPtr, boolean futureUse) { + swigCPtr = cPtr; + } + + protected SWIGTYPE_p_switch_event_node_t() { + swigCPtr = 0; + } + + protected static long getCPtr(SWIGTYPE_p_switch_event_node_t obj) { + return (obj == null) ? 0 : obj.swigCPtr; + } +} + Added: freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_switch_event_types_t.java ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_switch_event_types_t.java Mon Jul 7 15:33:23 2008 @@ -0,0 +1,26 @@ +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org) + * Version 1.3.35 + * + * Do not make changes to this file unless you know what you are doing--modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + +package org.freeswitch.swig; + +public class SWIGTYPE_p_switch_event_types_t { + private long swigCPtr; + + protected SWIGTYPE_p_switch_event_types_t(long cPtr, boolean futureUse) { + swigCPtr = cPtr; + } + + protected SWIGTYPE_p_switch_event_types_t() { + swigCPtr = 0; + } + + protected static long getCPtr(SWIGTYPE_p_switch_event_types_t obj) { + return (obj == null) ? 0 : obj.swigCPtr; + } +} + Added: freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_switch_queue_t.java ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_switch_queue_t.java Mon Jul 7 15:33:23 2008 @@ -0,0 +1,26 @@ +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org) + * Version 1.3.35 + * + * Do not make changes to this file unless you know what you are doing--modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + +package org.freeswitch.swig; + +public class SWIGTYPE_p_switch_queue_t { + private long swigCPtr; + + protected SWIGTYPE_p_switch_queue_t(long cPtr, boolean futureUse) { + swigCPtr = cPtr; + } + + protected SWIGTYPE_p_switch_queue_t() { + swigCPtr = 0; + } + + protected static long getCPtr(SWIGTYPE_p_switch_queue_t obj) { + return (obj == null) ? 0 : obj.swigCPtr; + } +} +

1 0