February 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r11826 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 11:02:00 2009 New Revision: 11826 Log: Thu Jan 15 06:48:04 CST 2009 Pekka Pessi <first.last(a)nokia.com> * msg_parser.c: msg_header_add_format() added in 1.12.10 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser.c Wed Feb 11 11:02:00 2009 @@ -2736,6 +2736,8 @@ * * Parse result from printf-formatted params as a given header field and add * result to the message. + * + * @NEW_1_12_10 */ int msg_header_add_format(msg_t *msg, msg_pub_t *pub,

1 0

[commit] r11825 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 11:01:43 2009 New Revision: 11825 Log: Wed Jan 14 06:35:56 CST 2009 Pekka Pessi <first.last(a)nokia.com> * nta_tag.c: updated tag documentation NTATAG_GRAYLIST added in 1.12,8, NTATAG_MAX_PROCEEDING() in 1.12.9, NTATAG_TLS_RPORT() in 1.12.10 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c Wed Feb 11 11:01:43 2009 @@ -418,6 +418,7 @@ * @par Values * - Maximum acceptable size of a queue (size_t). * + * @NEW_1_12_9 */ tag_typedef_t ntatag_max_proceeding = USIZETAG_TYPEDEF(max_proceeding); @@ -665,6 +666,8 @@ * - 600 (graylist server for 10 minutes) * * @sa NTATAG_BLACKLIST(), NTATAG_TIMEOUT_408() + * + * @NEW_1_12_8 */ tag_typedef_t ntatag_graylist = UINTTAG_TYPEDEF(graylist); @@ -1334,6 +1337,8 @@ * - 0 - do not use "rport" parameter * * @sa @RFC3581, NTATAG_CLIENT_RPORT(), NTATAG_TCP_RPORT(), NTATAG_TLS_RPORT(), @Via + * + * @since Tag type and NTATAG_SERVER_RPORT(2) was added in @VERSION_1_12_9. */ tag_typedef_t ntatag_server_rport = INTTAG_TYPEDEF(server_rport); @@ -1376,6 +1381,8 @@ * on client side * * @sa @RFC3581, NTATAG_CLIENT_RPORT(), NTATAG_SERVER_RPORT(), @Via + * + * @NEW_1_12_10 */ tag_typedef_t ntatag_tls_rport = BOOLTAG_TYPEDEF(tls_rport);

1 0

[commit] r11824 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 11:01:12 2009 New Revision: 11824 Log: Tue Jan 13 16:23:40 CST 2009 Pekka Pessi <first.last(a)nokia.com> * NUTAG_REFRESH_WITHOUT_SDP(): added in 1.12.10 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_tag.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_tag.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_tag.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_tag.c Wed Feb 11 11:01:12 2009 @@ -1152,6 +1152,8 @@ * @sa #nua_r_update, NUTAG_SESSION_TIMER(), NUTAG_MIN_SE_REF(), * NUTAG_SESSION_REFRESHER(), NUTAG_UPDATE_REFRESH(), @RFC4028, * @SessionExpires, @MinSE + * + * @NEW_1_12_10 */ tag_typedef_t nutag_refresh_without_sdp = BOOLTAG_TYPEDEF(refresh_without_sdp);

1 0

[commit] r11823 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 11:00:42 2009 New Revision: 11823 Log: Tue Jan 13 16:23:09 CST 2009 Pekka Pessi <first.last(a)nokia.com> * su_inet_ntop(), su_inet_pton(): added in 1.12.9 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/inet_ntop.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/inet_pton.c 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 Wed Feb 11 11:00:42 2009 @@ -44,6 +44,22 @@ * author: * Paul Vixie, 1996. */ + +/** inet_ntop() replacement. + * + * Convert a network format address to presentation format. + * + * @param af[in] address family + * @param src[in] network address to convert + * @param dst[out] return-value string + * @param size[in] maximum lenght of @a dst string + * + * @return Pointer to presentation format address (`dst'), or NULL (see errno). + * + * @author Paul Vixie, 1996. + * + * @NEW_1_12_9 + */ const char * su_inet_ntop(int af, void const *src, char *dst, size_t size) { 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 Wed Feb 11 11:00:42 2009 @@ -44,6 +44,25 @@ * author: * Paul Vixie, 1996. */ + +/** inet_pton() replacement. + * + * Convert from presentation format in @a src (which usually means ASCII printable) + * to network format in @a dst (which is usually some kind of binary format). + * + * @param af[in] address family + * @param src[in] string containing address to convert + * @param dst[out] return-value network address + * (struct in_addr or struct in_addr6) + * + * @retval 1 if the address was valid for the specified address family + * @retval 0 if the address wasn't valid (`dst' is untouched in this case) + * @retval -1 if some other error occurred (`dst' is untouched in this case, too) + * + * @author Paul Vixie, 1996. + * + * @NEW_1_12_9 + */ int su_inet_pton(int af, const char * src, void * dst) {

1 0

[commit] r11822 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/tport
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 11:00:16 2009 New Revision: 11822 Log: Tue Jan 13 16:22:39 CST 2009 Pekka Pessi <first.last(a)nokia.com> * tport_type_tls.c, tport_tls.c: added Jarod Neuner as one of authors Cleaned whitespace, too. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Feb 11 11:00:16 2009 @@ -1 +1 @@ -Wed Feb 11 10:55:01 CST 2009 +Wed Feb 11 11:00:10 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c Wed Feb 11 11:00:16 2009 @@ -27,8 +27,7 @@ * * @author Mikko Haataja <ext-Mikko.A.Haataja(a)nokia.com> * @author Pekka Pessi <ext-Pekka.Pessi(a)nokia.com> - * - * Copyright 2001, 2002 Nokia Research Center. All rights reserved. + * @author Jarod Neuner <janeuner(a)networkharbor.com> * */ @@ -696,7 +695,7 @@ int events = su_wait_events(w, self->tp_socket); int error; - SU_DEBUG_7(("%s(%p): events%s%s%s%s\n", __func__, (void *)self, + SU_DEBUG_7(("%s(%p): events%s%s%s%s\n", __func__, (void *)self, events & (SU_WAIT_CONNECT) ? " CONNECTING" : "", events & SU_WAIT_IN ? " NEGOTIATING" : "", events & SU_WAIT_ERR ? " ERROR" : "", @@ -722,7 +721,7 @@ } if ((tls = tlstp->tlstp_context) == NULL) { - SU_DEBUG_3(("%s(%p): Error: no TLS context data for connected socket.\n", + SU_DEBUG_3(("%s(%p): Error: no TLS context data for connected socket.\n", __func__, tlstp)); tport_close(self); tport_set_secondary_timer(self); @@ -746,7 +745,7 @@ case SSL_ERROR_WANT_WRITE: /* OpenSSL is waiting for the peer to receive handshake data */ self->tp_events = SU_WAIT_IN | SU_WAIT_ERR | SU_WAIT_HUP | SU_WAIT_OUT; - su_root_eventmask(mr->mr_root, self->tp_index, + su_root_eventmask(mr->mr_root, self->tp_index, self->tp_socket, self->tp_events); return 0; @@ -761,7 +760,7 @@ self->tp_events = SU_WAIT_IN | SU_WAIT_ERR | SU_WAIT_HUP; if ((su_wait_create(wait, self->tp_socket, self->tp_events) == -1) || - ((self->tp_index = su_root_register(mr->mr_root, wait, tport_wakeup, + ((self->tp_index = su_root_register(mr->mr_root, wait, tport_wakeup, self, 0)) == -1)) { tport_close(self); tport_set_secondary_timer(self); @@ -773,7 +772,7 @@ self->tp_is_connected = 1; self->tp_verified = tls->verified; self->tp_subjects = tls->subject == NULL ? NULL : - su_strlst_dup(self->tp_home, tls->subject); + su_strlst_dup(self->tp_home, tls->subject); if (tport_has_queued(self)) tport_send_event(self); @@ -788,7 +787,7 @@ { char errbuf[64]; ERR_error_string_n(status, errbuf, 64); - SU_DEBUG_3(("%s(%p): TLS setup failed (%s)\n", + SU_DEBUG_3(("%s(%p): TLS setup failed (%s)\n", __func__, self, errbuf)); } break; @@ -801,4 +800,3 @@ return 0; } - Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c Wed Feb 11 11:00:16 2009 @@ -31,6 +31,7 @@ * @author Tat Chan <Tat.Chan(a)nokia.com> * @author Kai Vehmanen <kai.vehmanen(a)nokia.com> * @author Martti Mela <Martti.Mela(a)nokia.com> + * @author Jarod Neuner <janeuner(a)networkharbor.com> * * @date Split here: Fri Mar 24 08:45:49 EET 2006 ppessi * @date Originally Created: Thu Jul 20 12:54:32 2000 ppessi @@ -554,7 +555,7 @@ /* Alloc a new transport object, then register socket events with it */ if ((self = tport_alloc_secondary(pri, s, 1, &reason)) == NULL) { SU_DEBUG_3(("%s(%p): incoming secondary on "TPN_FORMAT - " failed. reason = %s\n", __func__, pri, + " failed. reason = %s\n", __func__, pri, TPN_ARGS(pri->pri_primary->tp_name), reason)); return 0; } @@ -622,12 +623,12 @@ socklen_t susalen = sizeof(susa); if (getsockname(server_socket, &susa.su_sa, &susalen) < 0) { - SU_DEBUG_3(("%s(%p): getsockname(): %s\n", + SU_DEBUG_3(("%s(%p): getsockname(): %s\n", __func__, (void *)self, su_strerror(su_errno()))); } else { susa.su_port = 0; if (bind(s, &susa.su_sa, susalen) < 0) { - SU_DEBUG_3(("%s(%p): bind(local-ip): %s\n", + SU_DEBUG_3(("%s(%p): bind(local-ip): %s\n", __func__, (void *)self, su_strerror(su_errno()))); } } @@ -651,7 +652,7 @@ SU_DEBUG_5(("%s(%p): connecting to " TPN_FORMAT "\n", __func__, (void *)self, TPN_ARGS(self->tp_name))); - + tport_set_secondary_timer(self); return self; @@ -660,11 +661,10 @@ err = errno; if (SU_LOG_LEVEL >= errlevel) su_llog(tport_log, errlevel, "%s(%p): %s (pf=%d %s/%s): %s\n", - __func__, (void *)pri, what, ai->ai_family, tpn->tpn_proto, + __func__, (void *)pri, what, ai->ai_family, tpn->tpn_proto, tport_hostport(buf, sizeof(buf), (void *)ai->ai_addr, 2), su_strerror(err)); tport_zap_secondary(self); su_seterrno(err); return NULL; } -

1 0

[commit] r11821 - freeswitch/trunk/libs/sofia-sip/m4
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 10:59:44 2009 New Revision: 11821 Log: Tue Jan 13 16:21:44 CST 2009 Pekka Pessi <first.last(a)nokia.com> * sac-su2.m4: check for strnlen(), do not check for strcasestr() Modified: freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 Modified: freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 ============================================================================== --- freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 (original) +++ freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 Wed Feb 11 10:59:44 2009 @@ -530,6 +530,7 @@ socketpair gethostname gethostbyname getipnodebyname \ poll epoll_create kqueue select if_nameindex \ signal alarm \ + strnlen \ getaddrinfo getnameinfo freeaddrinfo gai_strerror getifaddrs \ getline getdelim getpass]) # getline getdelim getpass are _GNU_SOURCE stuff @@ -548,7 +549,7 @@ [Define to 1 if you have if_nameindex().]) fi -SAC_REPLACE_FUNCS([memmem memccpy memspn memcspn strcasestr strtoull \ +SAC_REPLACE_FUNCS([memmem memccpy memspn memcspn strtoull \ inet_ntop inet_pton poll]) if test $ac_cv_func_signal = yes ; then

1 0

[commit] r11820 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 10:59:20 2009 New Revision: 11820 Log: Tue Jan 13 16:20:56 CST 2009 Pekka Pessi <first.last(a)nokia.com> * TPTAG_TLS_VERIFY_PEER() added in 1.12.10 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tag.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tag.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tag.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tag.c Wed Feb 11 10:59:20 2009 @@ -291,6 +291,8 @@ * * Use with tport_tbind(), nua_create(), nta_agent_create(), * nta_agent_add_tport(), nth_engine_create(), or initial nth_site_create(). + * + * @NEW_1_12_10. */ tag_typedef_t tptag_tls_verify_peer = UINTTAG_TYPEDEF(tls_verify_peer);

1 0

[commit] r11819 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 10:57:55 2009 New Revision: 11819 Log: Tue Jan 13 16:20:06 CST 2009 Pekka Pessi <first.last(a)nokia.com> * su_localinfo.c: using SU_LOCALINFO_TEST Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c 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 Wed Feb 11 10:57:55 2009 @@ -67,7 +67,11 @@ #include <net/if_types.h> #endif -#if HAVE_GETIFADDRS +#if SU_LOCALINFO_TEST + +#undef USE_LOCALINFO0 + +#elif HAVE_GETIFADDRS #define USE_LOCALINFO0 1 #define localinfo0 bsd_localinfo @@ -81,6 +85,7 @@ static int win_localinfo(su_localinfo_t const *, su_localinfo_t **); #else +/* No localinfo0(), use localinfo4() and localinfo6() */ #undef USE_LOCALINFO0 static int localinfo4(su_localinfo_t const *, su_localinfo_t **); @@ -90,9 +95,13 @@ #endif +static int li_scope4(uint32_t ip4); +static int li_scope6(struct in6_addr const *ip6); + +#if !SU_LOCALINFO_TEST + static int li_name(su_localinfo_t const*, int, su_sockaddr_t const*, char **); static void li_sort(su_localinfo_t *i, su_localinfo_t **rresult); -static int li_scope4(uint32_t ip4); /** @brief Request local address information. * @@ -196,8 +205,13 @@ *hh = *hints; if (hh->li_canonname) hh->li_flags |= LI_CANONNAME; +#if 0 + /* hints->li_ifname is used to select by interface, + li_ifname is returned with LI_IFNAME flag + */ if ((hh->li_flags & LI_IFNAME) && hh->li_ifname == NULL) return ELI_BADHINTS; +#endif } switch (hh->li_family) { @@ -255,6 +269,8 @@ return error; } +#endif + /** Free local address information. * * Free a list of su_localinfo_t structures obtained with su_getlocalinfo() @@ -415,16 +431,17 @@ extern int su_get_local_ip_addr(su_sockaddr_t *su); #endif -#if USE_LOCALINFO0 +#if SU_LOCALINFO_TEST +#elif USE_LOCALINFO0 +/* no localinfo4 */ #elif HAVE_IFCONF #if __APPLE_CC__ /** Build a list of local IPv4 addresses and append it to *rresult. */ static int localinfo4(su_localinfo_t const *hints, su_localinfo_t **rresult) { - su_localinfo_t *tbf = NULL, **lli = &tbf; - su_localinfo_t *li = NULL, *li_first = NULL; + su_localinfo_t *li = NULL; su_sockaddr_t *su; int error = ELI_NOADDRESS; char *canonname = NULL; @@ -453,8 +470,8 @@ } - li = calloc(1, sizeof(su_localinfo_t)); - sa = calloc(1, sizeof(su_sockaddr_t)); + li = calloc(1, (sizeof *li) + (sizeof *sa)); + sa = (void *)(li + 1); error = getsockname(s, (struct sockaddr *) sa, &salen); if (error < 0 && errno == SOCKET_ERROR) { @@ -511,8 +528,7 @@ err: if (canonname) free(canonname); - if (li_first) free(li_first); - su_freelocalinfo(tbf); + if (li) free(li); su_close(s); return error; @@ -772,8 +788,7 @@ li->li_addrlen = su_sockaddr_size(su); li->li_addr = su; li->li_canonname = canonname; - if (hints->li_flags & LI_IFNAME) - li->li_ifname = if_name; + li->li_ifname = if_name; canonname = NULL; li_first = NULL; @@ -917,8 +932,8 @@ #endif -#if USE_LOCALINFO0 || !SU_HAVE_IN6 - +#if USE_LOCALINFO0 || !SU_HAVE_IN6 || SU_LOCALINFO_TEST +/* No localinfo6() */ #elif HAVE_PROC_NET_IF_INET6 /** Build a list of local IPv6 addresses and append it to *return_result. */ static @@ -1128,8 +1143,9 @@ } #endif - -#if HAVE_GETIFADDRS +#if !USE_LOCALINFO0 +/* no localinfo0() or bsd_localinfo() */ +#elif HAVE_GETIFADDRS #include <ifaddrs.h> @@ -1455,6 +1471,7 @@ } #elif HAVE_SIO_ADDRESS_LIST_QUERY + static int localinfo0(su_localinfo_t const *hints, su_localinfo_t **rresult) { @@ -1572,6 +1589,8 @@ } #endif +#if !SU_LOCALINFO_TEST + static int li_name(su_localinfo_t const *hints, int gni_flags, @@ -1639,6 +1658,8 @@ } } +#endif + /**Get local IP address. * * @deprecated

1 0

[commit] r11818 - freeswitch/trunk/libs/sofia-sip/rules
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 10:57:36 2009 New Revision: 11818 Log: add missing file Added: freeswitch/trunk/libs/sofia-sip/rules/silent.am Added: freeswitch/trunk/libs/sofia-sip/rules/silent.am ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/rules/silent.am Wed Feb 11 10:57:36 2009 @@ -0,0 +1,49 @@ +# Silent compilation w/ Automake 1.9 or 1.10 +# ---------------------------------------------------------- + +# Automake 1.9.6 is not clever enough to override suffix rules within if +# if SOFIA_COMPILE_SILENT + +SOFIA_SILENT=@ + +LIBTOOL_FLAGS = --silent + +# From Automake 1.9.6 - +LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(LIBTOOL_FLAGS) \ + $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) + +LINK = ${SOFIA_SILENT}test ${SOFIA_SILENT} != @ || echo ' LINK $@'; \ + $(LIBTOOL) --tag=CC --mode=link $(LIBTOOL_FLAGS) \ + $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + +# Rules from depend2.am (GENERIC = TRUE, SUBDIROBJ = FALSE, %FASTDEP% = am_fastdepCC) silenced. +.c.o: + @test ${SOFIA_SILENT} != @ || echo ' COMPILE $@' +if am__fastdepCC + ${SOFIA_SILENT}if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ + then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +else +if AMDEP + ${SOFIA_SILENT}source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + ${SOFIA_SILENT}DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +endif + ${SOFIA_SILENT}$(COMPILE) -c -o $@ $< +endif + +.c.lo: + @test ${SOFIA_SILENT} != @ || echo ' LTCOMPILE $@' +if am__fastdepCC + ${SOFIA_SILENT}if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ + then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +else +if AMDEP + ${SOFIA_SILENT}source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + ${SOFIA_SILENT}DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +endif + ${SOFIA_SILENT}$(LTCOMPILE) -c -o $@ $< +endif + +# endif

1 0

[commit] r11817 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 10:56:57 2009 New Revision: 11817 Log: Tue Jan 13 15:19:59 CST 2009 Pekka Pessi <first.last(a)nokia.com> * check_session.c: added a test case for sending re-INVITE w/o offer Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c Wed Feb 11 10:56:57 2009 @@ -1605,6 +1605,43 @@ } END_TEST +START_TEST(call_2_6_4) +{ + nua_handle_t *nh; + struct message *invite, *ack; + + s2_case("2.6.4", "re-INVITEs w/o SDP", + "NUA sends re-INVITE w/o SDP, " + "receives SDP w/ offer, " + "sends ACK w/ answer, " + "sends BYE."); + + /* Bug reported by Liu Yang 2009-01-11 */ + nh = invite_to_nua(TAG_END()); + + nua_invite(nh, SIPTAG_PAYLOAD_STR(""), TAG_END()); + fail_unless(s2_check_callstate(nua_callstate_calling)); + invite = s2_wait_for_request(SIP_METHOD_INVITE); + fail_if(!invite); + fail_if(invite->sip->sip_content_type); + soa_generate_offer(soa, 1, NULL); + respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END()); + s2_free_message(invite); + + ack = s2_wait_for_request(SIP_METHOD_ACK); + fail_if(!ack); + process_answer(ack); + s2_free_message(ack); + + fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless(s2_check_callstate(nua_callstate_ready)); + + bye_by_nua(nh, TAG_END()); + + nua_handle_destroy(nh); +} +END_TEST + TCase *reinvite_tcase(void) { TCase *tc = tcase_create("2.6 - re-INVITEs"); @@ -1614,6 +1651,7 @@ tcase_add_test(tc, call_2_6_1); tcase_add_test(tc, call_2_6_2); tcase_add_test(tc, call_2_6_3); + tcase_add_test(tc, call_2_6_4); } return tc; }

1 0