Author: mikej Date: Mon Nov 12 11:04:47 2007 New Revision: 6219 Added: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_htable2.c freeswitch/trunk/libs/sofia-sip/open_c/Makefile.am Modified: freeswitch/trunk/libs/sofia-sip/Makefile.am freeswitch/trunk/libs/sofia-sip/RELEASE freeswitch/trunk/libs/sofia-sip/configure.ac freeswitch/trunk/libs/sofia-sip/docs/release_management.txt freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/test_class.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/nea_server.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua.docs freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_nua.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_proxy.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_sip_events.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/htable.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/htable2.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/tstdef.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_htable.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_su.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_alloc.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_root.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/test_tport.c freeswitch/trunk/libs/sofia-sip/open_c/build_sources.cmd freeswitch/trunk/libs/sofia-sip/open_c/config.h.in freeswitch/trunk/libs/sofia-sip/win32/Makefile.am freeswitch/trunk/libs/sofia-sip/win32/build_sources.cmd freeswitch/trunk/libs/sofia-sip/win32/check.cmd freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua/libsofia_sip_ua.dsp freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua/libsofia_sip_ua.vcproj freeswitch/trunk/libs/sofia-sip/win32/tests/torture_su_root/torture_su_root.dsp freeswitch/trunk/libs/sofia-sip/win32/tests/torture_su_root/torture_su_root.vcproj freeswitch/trunk/libs/sofia-sip/win32/utils/stunc/stunc.dsp freeswitch/trunk/libs/sofia-sip/win32/utils/stunc/stunc.vcproj Log: merge with sofia darcs trunk: Fri Oct 12 08:42:17 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * Makefile.am: fixed ordering of SUBDIRS Fri Oct 12 13:32:02 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * win32/utils/stunc.dsp: fixed include paths Fri Oct 12 13:32:19 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * win32/tests/torture_su_root: fixed include paths Fri Oct 12 13:32:52 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * win32: added missing files from Makefile.am, .dsp, vproj Fri Oct 12 13:33:42 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * win32/build_sources.cmd: added extra headers to sip_tag.c and sip_parser_table.c Fri Oct 12 13:37:00 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * win32/check.cmd: added option -a to relevant tests. Optionally check Release build. Fri Oct 12 13:37:25 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * url.h: silenced warning on URL_INIT_AS() Fri Oct 12 13:37:43 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * tstdef.h: silenced warnings on TEST_M() Fri Oct 12 13:38:15 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * nta_internal.h, nua_params.c: fixed NTATAG_UDP_MTU() type Fri Oct 12 13:39:06 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * test_class.h: fixed test_auth_class, test_numeric_class declaration Fri Oct 12 13:39:51 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * Fixed various tests on win32. Fri Oct 12 13:39:58 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * sip_basic.c: removed dead code Fri Oct 12 14:38:02 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * nea_server.c: avoid raporting un-SUBSCRIBE twice Fri Oct 12 14:38:31 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * test_sip_events.c: checking some nua_i_notifier/nua_i_subscriber events Fri Oct 12 14:38:42 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> tagged Release candidate 2 for 1.12.7 Mon Oct 15 04:03:22 EDT 2007 Pekka.Pessi@nokia.com * configure.ac, RELEASE: version 1.12.7 Mon Oct 15 08:27:13 EDT 2007 Pekka.Pessi@nokia.com * open_c: included in the dist Tue Oct 16 08:07:46 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * nua: Open C fixes Wed Oct 17 06:50:11 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * nua.docs: replace reference to nua_cli.c with sofsip_cli Wed Oct 17 08:43:11 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> tagged rel-sofia-sip-1_12_7 Wed Oct 17 08:43:15 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> tagged 1.12.7 Wed Oct 17 11:01:12 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * libsofia-sip-ua/su/Makefile.am: fixed problem with automake 1.9 Wed Oct 17 11:13:15 EDT 2007 Pekka.Pessi@nokia.com * configure.ac, RELEASE: opened tree for development Tue Oct 23 10:45:17 EDT 2007 Pekka.Pessi@nokia.com * su_alloc.c: fixed su_home_init() (not initializing pointer to mutexes) Thu Oct 25 13:15:45 EDT 2007 Pekka.Pessi@nokia.com * nua_notifier.c: updated nua_i_subscribe, nua_notify() and nua_r_notify documentation Wed Nov 7 07:58:08 EST 2007 Pekka.Pessi@nokia.com * sofia-sip/htable2.h: fixed HTABLE_PROTOS2() Modified: freeswitch/trunk/libs/sofia-sip/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/Makefile.am Mon Nov 12 11:04:47 2007 @@ -8,7 +8,8 @@ AUTOMAKE_OPTIONS = foreign 1.7 SUBDIRS = libsofia-sip-ua $(GLIB_SUBDIRS) utils packages -DIST_SUBDIRS = libsofia-sip-ua libsofia-sip-ua-glib utils packages win32 +DIST_SUBDIRS = libsofia-sip-ua libsofia-sip-ua-glib utils packages \ + win32 open_c # note: when glib devel files are not available, make should not # enter the libsofia-sip-ua-glib subdir at all Modified: freeswitch/trunk/libs/sofia-sip/RELEASE ============================================================================== --- freeswitch/trunk/libs/sofia-sip/RELEASE (original) +++ freeswitch/trunk/libs/sofia-sip/RELEASE Mon Nov 12 11:04:47 2007 @@ -4,73 +4,32 @@ Changes since last release -------------------------- -The stack now compiles and runs on Symbian SDK with Open C support -enabled. -The stacksupports specifying the outbound proxy by a set of Route -headers as recommended by RFC3261. It also supports CR-LF-based keepalives -on TCP connections. - -Bugs in call state machines, URI and SDP handling has been fixed. +<changes since last written in freshmeat.net "Changes:" style; + and in less than 10 lines, written in 3rd person English, with + complete sentences /> +Bugs in blaa and foo have been fixed. The stack now supports +use of foobar... API/ABI changes and versioning ------------------------------ -New features in API are marked with Doxytag macro @VERSION_1_12_7 or -@NEW_1_12_7. +<see previous release notes at + http://sofia-sip.sourceforge.net/relnotes/ for examples ; + - should include all changes to public headers, and + other important information to developers; + - and should be updated _continuously_! /> + +**template**: New features in API are marked with Doxytag macro @VERSION_1_XX_X. libsofia-sip-ua: +- **template**: Added foobar() function (sofia-sip/foobar.h). - This release is ABI/API compatible with applications linked against any 1.12.x release. However, applications built against this release won't work against an older library. The ABI has been tested with the nua module unit test (test_nua) built against original 1.12.0 release. -libsofia-sip-ua/nua: -- Added tag NUTAG_INITIAL_ROUTE(), NUTAG_INITIAL_ROUTE_STR() - -libsofia-sip-ua/nta: -- Added nta_incoming_received() -- Added accessor function nta_outgoing_branch() -- Added tag NTATAG_TIMER_C() -- Deprecated nta_msg_ackbye() - -libsofia-sip-ua/iptsec: -- Added tag AUTHTAG_MAX_NCOUNT() - -libsofia-sip-ua/sip: -- Added SIPEXTHDRTAG_TYPEDEF() macro and tag class sipexthdrtag_class[] -- Added SIP headers Alert-Info, Reply-To. Remote-Party-ID, - P-Asserted-Identity, and P-Preferred-Identity -- Added sip_update_default_mclass() and sip_extend_mclass() -- Added macros SIP_HAVE_XXXX for extra headers, e.g., SIP_HAVE_ALERT_INFO(). - -libsofia-sip-ua/soa: -- Added tags SOATAG_ORDERED_USER() and SOATAG_REUSE_REJECTED() - -libsofia-sip-ua/tport: -- Updated transport timers - - Added TPTAG_KEEPALIVE(), TPTAG_PINGPONG(), TPTAG_PONG2PING() - - Added tport_is_clear_to_send(), tport_has_queued() -- Updated timer handling - - Added abstract type su_timer_queue_t (typedef'd to SU_TIMER_QUEUE_T) - - Updated su_task_timers() and su_timer_expire() prototypes - -libsofia-sip-ua/stun: -- Removed extra system headers from <sofia-sip/stun_common.h> - -libsofia-sip-ua/su: -- Added su_nanotime_t and functions su_nanotime()/su_monotime() -- Added function su_getsocktype() -- Added heap template in <sofia-sip/heap.h> -- Added configure option --disable-tag-cast and macro SU_INLINE_TAG_CAST -- Added global variable su_socket_blocking. If it is set to true, - sockets are created as blocking. -- Added access point selection functionality for Open C / Symbian -- Added functions su_root_release(), su_root_obtain() and - su_root_has_thread(). A thread can release a su_root_t and another one can - obtain it. - libsofia-sip-ua-glib: - No ABI/API changes, compatible with 1.12.0. Note, libsofia-sip-ua-glib interface is not considered stable and may change in a future 1.12.x @@ -79,82 +38,36 @@ Contributors to this release ---------------------------- -- Mikhail Zabaluev (bug fixes) -- Fabio Margarido (bug fixes) -- Martti Mela (Open C port and extra functionality, bug fixes) -- Kai Vehmanen (fixes to win32 VC6/2005 project files) -- Pekka Pessi (everything else) +<list of people who contributed to _this_ release + - update as people's patches are added, or when you commit stuff + - current development team members (see AUTHORS) may be omitted, + or listed at the end of the contribur list (depending on the scope + of the work done since the last release) + - name of the contributor should be enough (email addresses in AUTHORS), + plus a _brief_ description of what was contributed + - roughly sorted by number of patches accepted +/> + +- **template**: First Surname (patch to nua/soa/msg) See the AUTHORS file in the distribution package. Notes on new features --------------------- -The route to the outbound proxy can now be specified as an explicit route -set. - -The TCP transport can use CR-LF keepalive and CR-LF PING-PONG messages. - -IPv6 support can now be disabled in VC6/VC2005 builds, by -setting SU_HAVE_IN6 to zero `win32/sofia-sip/su_configure.h'. - -Symbian Open C build and packaging (SIS) files for libsofia-sip-ua, -libsofia-sip-ua-glib and for several test apps have been added under -sofia-sip/open_c. - -The SIP headers Alert-Info, Reply-To. Remote-Party-ID, P-Asserted-Identity, -and P-Preferred-Identity are not not available by default. Application must -enable them with sip_update_default_mclass() and sip_extend_mclass(). +<information about major new features + - new/changed/removed functionality + - links to further documentation + - section may be omitted for minor releases +/> Bugs fixed in this release -------------------------- -- Fixed sf.net bug #1804248: nua_prack() now works. - Thanks to Fabio Margarido for sending the patch. -- Fixed sf.net bug #1810115: crash after failed outgoing request and - nta_destroy() - Thanks to Mikhail Zabaluev for reporting the problem. -- Fixed sf.net bug #1804248: nua_prack() now works. - Thanks to Fabio Margarido for sending the patch. -- Fixed sf.net bug 1803686: nua_destroy() can now be called from inside - nua event callback. - Thanks to Mikhail Zabaluev for reporting the problem. -- SIP Content-Length structure was casted to one with 64-bit integer instead - of 32-bit, so message body was not parsed on 64-bit big-endian platform. - Thanks to Martin Drasar for hunting down the bug. -- Authentication scheme token was compared as case-sensitive on client side. - Thanks to Russell McConnachie for reporting this problem. -- Fixed sf.net bug #1706629: in-dialog requests not routed according to the - dialog route. Problem was because the outbound proxy was not handles as - RECOMMENDED by RFC 3261. The new tag NUTAG_INITIAL_ROUTE() allows correct - handling of requests. -- Fixed problems in nua state engines (call setup failing if some messages - were re-ordered or crashing when they were lost) - Thanks to Michail Jerris, Anthony Minessale, and others in Freeswitch - project for hunting down these bugs and reporting them -- When nua generates Contact URI, the user-specified URI parameters are now - overriden by actual transport parameters (e.g., transport=tcp) - Thanks to Mikhail Zabaluev for submitting the patch. -- Fixed sf.net bug #1750691: used to send ACK&BYE when extra 200 OK is - received and the 200 OK did not match any client transaction. - Thanks to Mikhail Zabaluev for reporting the problem. -- Fixed problem of un-escaping reserved characters in URIs - Thanks to Jan van den Bosch, Fabio Margarido and Mikhail Zabaluev for - reporting the problem. -- Fixed missing links in doxygen-generated documentation - Thanks to Jerry Richards for reporting this problem. -- Fixed timing problem with CANCELed INVITE transactions. - Thanks to Fabio Margarido for reporting this problem. -- Fixed sf.net bug #1771243: tport_check_trunc() does not block anymore - Thanks to Erland Lwin for reporting the problem -- Fixed sf.net bug #1733323: extra tag arguments were used by - nta_outgoing_tcancel(). - Thanks to Fabio Margarido for reporting this problem. -- Fixed sf.net bug #1747149: sdp_session_cmp() ignored some m= lines - (e.g., new SDP in re-INVITE was sometimes ignored) - Thanks to Mikhail Zabaluev for reporting the problem. -- Fixed sf.net bug #1726034: crash in msg_as_string() with too large messages -- Fixed sf.net bug #1472682: ACK did not find INVITE server transaction when - the To URI had been changed. -- Do not block when making a TCP connect()ion in tport. - Thanks to Mikhail Zabaluev for submitting the patch. +< notable bugs fixed in this release + - check the sf.net bug tracker; see closed bugs, + sorted by closing date + - other bugs as fixed in CVS/darcs +/> + +- **template**: #9499652 sf.net bug item title Modified: freeswitch/trunk/libs/sofia-sip/configure.ac ============================================================================== --- freeswitch/trunk/libs/sofia-sip/configure.ac (original) +++ freeswitch/trunk/libs/sofia-sip/configure.ac Mon Nov 12 11:04:47 2007 @@ -11,7 +11,7 @@ dnl --------------------------- dnl update both the version for AC_INIT and the LIBSOFIA_SIP_UA_MAJOR_MINOR -AC_INIT([sofia-sip], [1.12.6work]) +AC_INIT([sofia-sip], [1.12.7devel]) AC_CONFIG_SRCDIR([libsofia-sip-ua/sip/sofia-sip/sip.h]) AC_SUBST(VER_LIBSOFIA_SIP_UA_MAJOR_MINOR, [1.12]) dnl Includedir specific to this sofia version @@ -295,6 +295,8 @@ utils/Doxyfile win32/Makefile win32/config.h +open_c/Makefile +open_c/config.h ]) AC_CONFIG_COMMANDS([version],,[PACKAGE_VERSION=${PACKAGE_VERSION}]) Modified: freeswitch/trunk/libs/sofia-sip/docs/release_management.txt ============================================================================== --- freeswitch/trunk/libs/sofia-sip/docs/release_management.txt (original) +++ freeswitch/trunk/libs/sofia-sip/docs/release_management.txt Mon Nov 12 11:04:47 2007 @@ -79,8 +79,7 @@ - update sfnet_www/index.html to mention the latest release - commit the change to sf.net website CVS, and run the - sfnet_www/put_online.sh script at the sourceforge.net - shell server + sfnet_www/put_online.sh script Uploading the release to sourceforge.net ======================================== @@ -106,7 +105,7 @@ - replace the RELEASE file with RELEASE.template, and commit it to master source repository (see sofia-sip/README.developers) - change version in configure.ac from "X.Y.Z" to - "X.Y.Zwork" (as it is in many cases unknown what the + "X.Y.Zdevel" (as it is in many cases unknown what the next version will be) - make a "tree open for development" commit Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/Makefile.am Mon Nov 12 11:04:47 2007 @@ -13,21 +13,25 @@ # in the build OPT_LIBADD = OPT_SUBDIRS_STUN = +OPT_SUBDIRS_HTTP = OPT_SUBDIRS_NTH = if HAVE_STUN OPT_LIBADD += stun/libstun.la OPT_SUBDIRS_STUN += stun endif if HAVE_NTH -OPT_LIBADD += nth/libnth.la http/libhttp.la -OPT_SUBDIRS_NTH += nth http +OPT_LIBADD += http/libhttp.la nth/libnth.la +OPT_SUBDIRS_HTTP += http +OPT_SUBDIRS_NTH += nth endif # note: order does matter in the subdir list -SUBDIRS = su features bnf sresolv sdp url msg sip $(OPT_SUBDIRS_STUN) ipt soa \ - tport nta nea iptsec $(OPT_SUBDIRS_NTH) nua -DIST_SUBDIRS = su features bnf sresolv sdp url msg sip stun ipt soa \ - tport nta nea iptsec nth http nua docs +SUBDIRS = su features bnf sresolv ipt sdp url msg sip $(OPT_SUBDIRS_HTTP) \ + $(OPT_SUBDIRS_STUN) soa tport nta $(OPT_SUBDIRS_NTH) \ + nea iptsec nua +DIST_SUBDIRS = su features bnf sresolv ipt sdp url msg sip http \ + stun soa tport nta nth \ + nea iptsec nua docs DOXYGEN = doxygen Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/test_class.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/test_class.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/test_class.h Mon Nov 12 11:04:47 2007 @@ -172,7 +172,7 @@ msg_numeric_hash = 24435 }; -SOFIAPUBVAR msg_hclass_t test_auth_class[1], test_numeric_class[1]; +extern msg_hclass_t test_auth_class[1], test_numeric_class[1]; SOFIA_END_DECLS Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/nea_server.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/nea_server.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/nea_server.c Mon Nov 12 11:04:47 2007 @@ -201,6 +201,8 @@ sip_content_type_t *s_content_type; /** Content-Type of SUBSCRIBE body. */ sip_payload_t *s_payload; /**< Body of SUBSCRIBE. */ + unsigned s_reported :1 ; /**< Made watcher report upon un-SUBSCRIBE */ + unsigned s_processing : 1; unsigned s_rejected : 1; unsigned s_pending_flush : 1; @@ -1384,14 +1386,18 @@ int nes_watcher_callback(nea_server_t *nes, nea_event_t *ev, nea_sub_t *s, - sip_t const *sip) + sip_t const *sip, + sip_time_t now) { if (!nes->nes_in_callback) { nes->nes_in_callback = 1; - if (ev->ev_callback) { + if (ev->ev_callback && !s->s_reported) { nea_subnode_t sn[1]; - nea_subnode_init(sn, s, sip_now()); + nea_subnode_init(sn, s, now); + + if (sn->sn_expires == 0 || sn->sn_state == nea_terminated) + s->s_reported = 1; ev->ev_callback(nes, ev->ev_magic, ev, sn, sip); } @@ -1908,13 +1914,15 @@ } /* Callback for checking subscriber authorization */ - if (nes_watcher_callback(nes, ev, s, sip) < 0) { + if (nes_watcher_callback(nes, ev, s, sip, now) < 0) { if (irq) { nta_incoming_treply(irq, SIP_503_SERVICE_UNAVAILABLE, TAG_END()); nta_incoming_destroy(irq); } return -1; } + + evv = s->s_view; /* Callback can change event view */ @@ -1975,7 +1983,7 @@ { int notified = 0; ta_list ta; - int subscription_state_change = now == 0; + int suppress = now != 0; nea_event_t *ev = s->s_event; nea_state_t substate = s->s_state; @@ -1990,7 +1998,7 @@ assert(s->s_view); assert(ev); - if (!subscription_state_change && s->s_view->evv_updated == s->s_updated) + if (suppress && s->s_view->evv_updated == s->s_updated) return 0; if (now == 0) @@ -2069,7 +2077,7 @@ break; } - subscription_state_change = (s->s_view->evv_updated == s->s_updated); + suppress = (s->s_view->evv_updated == s->s_updated); n_evq = evq->evq_payload ? evq : evv->evv_primary->evv_head; @@ -2083,9 +2091,9 @@ SIPTAG_USER_AGENT_STR(nes->nes_server), SIPTAG_CONTACT(s->s_local), SIPTAG_EVENT(s->s_id), - TAG_IF(!subscription_state_change, + TAG_IF(!suppress, SIPTAG_CONTENT_TYPE(n_evq->evq_content_type)), - TAG_IF(!subscription_state_change, + TAG_IF(!suppress, SIPTAG_PAYLOAD(n_evq->evq_payload)), ta_tags(ta)); @@ -2104,7 +2112,7 @@ if (callback == NULL) { nta_outgoing_destroy(s->s_oreq), s->s_oreq = NULL; /* Inform the application of a subscriber leaving the subscription. */ - nes_watcher_callback(nes, ev, s, NULL); + nes_watcher_callback(nes, ev, s, NULL, now); } } ta_end(ta); @@ -2127,6 +2135,7 @@ { nea_server_t *nes = s->s_nes; int status = sip->sip_status->st_status; + sip_time_t now = sip_now(); if (status < 200) return 0; @@ -2135,8 +2144,6 @@ if (status < 300) { if (s->s_view->evv_updated != s->s_updated) { - sip_time_t now = sip_now(); - if (s->s_notified + s->s_throttle <= now) nea_sub_notify(nes, s, now, TAG_END()); else @@ -2148,7 +2155,7 @@ SU_DEBUG_5(("nea_server: removing subscriber " URL_PRINT_FORMAT "\n", URL_PRINT_ARGS(s->s_from->a_url))); /* Inform the application of a subscriber leaving the subscription. */ - nes_watcher_callback(nes, s->s_event, s, NULL); + nes_watcher_callback(nes, s->s_event, s, NULL, now); } return 0; Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua.docs ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua.docs (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua.docs Mon Nov 12 11:04:47 2007 @@ -332,15 +332,15 @@ @image html SIP_outgoing_operation_with_auth.gif - @section nua_simpleapplication Simple Application The following sections will present code examples from a simple application that uses services of NUA. The example is not complete but should present all relevant details of the basic use of NUA. -The source distribution of Sofia stack contains in directory nua an example -application nua_cli.c that can be studied for more complete example. +On sourceforge.net there is available an example application +<a href="http://sourceforge.net/project/showfiles.php?group_id=143636&package_id=179933"> +sofisip_cli.c</a> that can be studied for more complete example. @subsection nua_datastructures Data Structures & Defines Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c Mon Nov 12 11:04:47 2007 @@ -129,35 +129,53 @@ * @b SUBSCRIBE request is used to query SIP event state or establish a SIP * event subscription. * + * @param status status code of response sent automatically by stack + * @param phrase response phrase sent automatically by stack + * @param nh operation handle associated with the incoming request + * @param hmagic application context associated with the handle + * (NULL when handle is created by the stack) + * @param sip SUBSCRIBE request headers + * @param tags NUTAG_SUBSTATE() + * * Initial SUBSCRIBE requests are dropped with <i>489 Bad Event</i> * response, unless the application has explicitly included the @Event in * the list of allowed events with nua_set_params() tag NUTAG_ALLOW_EVENTS() - * (or SIPTAG_ALLOW_EVENTS() or SIPTAG_ALLOW_EVENTS_STR()). The application + * (or SIPTAG_ALLOW_EVENTS() or SIPTAG_ALLOW_EVENTS_STR()). + * + * If the event has been allowed the application * can decide whether to accept the SUBSCRIBE request or reject it. The * nua_response() call responding to a SUBSCRIBE request must have * NUTAG_WITH() (or NUTAG_WITH_THIS()/NUTAG_WITH_SAVED()) tag. * * If the application accepts the SUBSCRIBE request, it must immediately * send an initial NOTIFY establishing the dialog. This is because the - * response to the SUBSCRIBE request may be lost because the SUBSCRIBE - * request was forked by an intermediate proxy. + * response to the SUBSCRIBE request may be lost by an intermediate proxy + * because it had forked the SUBSCRIBE request. * * SUBSCRIBE requests modifying (usually refreshing or terminating) an * existing event subscription are accepted by default and a <i>200 OK</i> * response along with a copy of previously sent NOTIFY is sent - * automatically. + * automatically to the subscriber. * * By default, only event subscriptions accepted are those created * implicitly by REFER request. See #nua_i_refer how the application must * handle the REFER requests. * - * @param status status code of response sent automatically by stack - * @param phrase response phrase sent automatically by stack - * @param nh operation handle associated with the incoming request - * @param hmagic application context associated with the handle - * (NULL when handle is created by the stack) - * @param sip SUBSCRIBE request headers - * @param tags NUTAG_SUBSTATE() + * @par Subscription Lifetime and Terminating Subscriptions + * + * Accepting the SUBSCRIBE request creates a dialog with a <i>notifier + * dialog usage</i> on the handle. The dialog usage is active, until the + * subscriber terminates the subscription, it times out or the application + * terminates the usage with nua_notify() call containing the tag + * NUTAG_SUBSTATE(nua_substate_terminated) or @SubscriptionState header with + * state "terminated" and/or expiration time 0. + * + * When the subscriber terminates the subscription, the application is + * notified of an termination by a #nua_i_subscribe event with + * NUTAG_SUBSTATE(nua_substate_terminated) tag. When the subscription times + * out, nua automatically initiates a NOTIFY transaction. When it is + * terminated, the application is sent a #nua_r_notify event with + * NUTAG_SUBSTATE(nua_substate_terminated) tag. * * @sa @RFC3265, nua_notify(), NUTAG_SUBSTATE(), @SubscriptionState, * @Event, nua_subscribe(), #nua_r_subscribe, #nua_i_refer, nua_refer() @@ -351,11 +369,22 @@ * * This function is used when the application implements itself the * notifier. The application must provide valid @SubscriptionState and - * @Event headers using SIP tags. If there is no @SubscriptionState header, - * the subscription state can be modified with NUTAG_SUBSTATE(). + * @Event headers using SIP tags. The subscription state can be modified + * with NUTAG_SUBSTATE(), however, its effect is overriden by + * @SubscriptionState header included in the nua_notify() tags. * * @bug If the @Event is not given by application, stack uses the @Event * header from the first subscription usage on handle. + * + * If there is no active <i>notifier dialog usage</i> or no notifier dialog + * usage matches the @Event header given by the application the nua_notify() + * request is rejected locally by the stack with status code 481. The local + * rejection can be bypassed if NUTAG_NEWSUB(1) is included in tags. + * + * Please note that including NUTAG_NEWSUB(1) in nua_notify() tags if there + * is a valid subscription may lead to an extra NOTIFY sent to subscriber if + * the subscription had been terminated by the subscriber or by a timeout + * before the nua_notify() is processed. * * @param nh Pointer to operation handle * @param tag, value, ... List of tagged parameters @@ -365,6 +394,7 @@ * * @par Related Tags: * NUTAG_SUBSTATE() \n + * NUTAG_NEWSUB() \n * Tags of nua_set_hparams() \n * Header tags defined in <sofia-sip/sip_tag.h> * @@ -461,8 +491,11 @@ if (now + expires < now) expires = SIP_TIME_MAX - now - 1; - /* Notifier can only shorten the subscription time */ - if (nu->nu_requested == 0 || nu->nu_requested >= now + expires) + /* We can change the lifetime of unsolicited subscription at will */ + if (nu->nu_requested == 0) + nu->nu_expires = nu->nu_requested = now + expires; + /* Notifier can only shorten the subscribed time */ + else if (nu->nu_requested >= now + expires) nu->nu_expires = nu->nu_requested = now + expires; } } @@ -648,7 +681,12 @@ * The @b NOTIFY may be sent explicitly by nua_notify() or implicitly by NUA * state machine. Implicit @b NOTIFY is sent when an established dialog is * refreshed by client or it is terminated (either by client or because of a - * timeout) + * timeout). + * + * The current subscription state is included in NUTAG_SUBSTATE() tag. The + * nua_substate_terminated indicates that the subscription is terminated, + * the notifier usage has been removed and when there was no other usages of + * the dialog the dialog state is also removed. * * @param status response status code * (if the request is retried, @a status is 100, the @a @@ -663,7 +701,7 @@ * @param tags NUTAG_SUBSTATE() indicating subscription state * SIPTAG_EVENT() indicating subscription event * - * @sa nua_notify(), @RFC3265, #nua_i_subscribe, #nua_i_refer + * @sa nua_notify(), @RFC3265, #nua_i_subscribe, #nua_i_refer, NUTAG_SUBSTATE() * * @END_NUA_EVENT */ Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.c Mon Nov 12 11:04:47 2007 @@ -1525,7 +1525,7 @@ sip_contact_t const *m; /* nta */ - usize_t udp_mtu = 0; + unsigned udp_mtu = 0; usize_t max_proceeding = 0; unsigned sip_t1 = 0, sip_t2 = 0, sip_t4 = 0, sip_t1x64 = 0; unsigned debug_drop_prob = 0; Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c Mon Nov 12 11:04:47 2007 @@ -1003,6 +1003,7 @@ msg_t *msg, int error) { + nua_dialog_usage_t *du = nua_dialog_usage_public(nr); tp_name_t const *tpn; int pending = nr->nr_error_report_id; @@ -1018,7 +1019,7 @@ tpn = tport_name(nr->nr_tport); SU_DEBUG_5(("nua_register(%p): tport to %s/%s:%s%s%s closed %s\n", - nua_dialog_usage_public(nr)->du_dialog->ds_owner, + du->du_dialog->ds_owner, tpn->tpn_proto, tpn->tpn_host, tpn->tpn_port, tpn->tpn_comp ? ";comp=" : "", tpn->tpn_comp ? tpn->tpn_comp : "", @@ -1027,7 +1028,7 @@ tport_unref(nr->nr_tport), nr->nr_tport = NULL; /* Schedule re-REGISTER immediately */ - nua_dialog_usage_set_refresh_range(nua_dialog_usage_public(nr), 0, 0); + nua_dialog_usage_set_refresh_range(du, 0, 0); } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_nua.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_nua.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_nua.c Mon Nov 12 11:04:47 2007 @@ -330,8 +330,6 @@ ctx->a.printer = o_events_init ? print_event : NULL; - sleep(2); - retval |= test_nua_api_errors(ctx); SINGLE_FAILURE_CHECK(); retval |= test_tag_filter(); SINGLE_FAILURE_CHECK(); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_proxy.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_proxy.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_proxy.c Mon Nov 12 11:04:47 2007 @@ -86,7 +86,7 @@ } \ extern int LIST_DUMMY_VARIABLE -#include <test_proxy.h> +#include "test_proxy.h" #include <sofia-sip/auth_module.h> struct proxy { Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_sip_events.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_sip_events.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_sip_events.c Mon Nov 12 11:04:47 2007 @@ -99,6 +99,7 @@ sip_t const *sip; tagi_t const *t, *n_tags, *r_tags; url_t b_url[1]; + enum nua_substate substate; nea_sub_t *sub = NULL; char const open[] = @@ -207,7 +208,7 @@ TAG_END()); run_ab_until(ctx, -1, save_until_notified_and_responded, - -1, NULL /* XXX save_until_received */); + -1, save_until_received); /* Client events: nua_subscribe(), nua_i_notify/nua_r_subscribe @@ -242,6 +243,9 @@ TEST_1(!en->next || !es->next); free_events_in_list(ctx, a->events); + /* XXX --- Do not check server side events */ + free_events_in_list(ctx, b->events); + if (print_headings) printf("TEST NUA-12.2: PASSED\n"); @@ -266,8 +270,7 @@ SIPTAG_PAYLOAD_STR(open), TAG_END()); - run_ab_until(ctx, -1, save_until_notified, - -1, NULL /* XXX save_until_received */); + run_ab_until(ctx, -1, save_until_notified, -1, save_until_received); /* subscriber events: nua_i_notify @@ -287,6 +290,9 @@ TEST_1(!e->next); free_events_in_list(ctx, a->events); + /* XXX --- Do not check server side events */ + free_events_in_list(ctx, b->events); + if (print_headings) printf("TEST NUA-12.3: PASSED\n"); @@ -308,7 +314,7 @@ UNSUBSCRIBE(a, a_call, a_call->nh, TAG_END()); run_ab_until(ctx, -1, save_until_final_response, - -1, NULL /* XXX save_until_received */); + -1, save_until_subscription); /* Client events: nua_unsubscribe(), nua_i_notify/nua_r_unsubscribe @@ -335,6 +341,19 @@ /* TEST_1(!e->next); */ free_events_in_list(ctx, a->events); + /* Server events: nua_i_subscription with terminated status */ + TEST_1(e = b->events->head); + TEST_E(e->data->e_event, nua_i_subscription); + TEST(tl_gets(e->data->e_tags, + NEATAG_SUB_REF(sub), + NUTAG_SUBSTATE_REF(substate), + TAG_END()), 2); + TEST_1(sub); + TEST(substate, nua_substate_terminated); + TEST_1(!e->next); + + free_events_in_list(ctx, b->events); + if (print_headings) printf("TEST NUA-12.5: PASSED\n"); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/Makefile.am Mon Nov 12 11:04:47 2007 @@ -18,7 +18,7 @@ check_PROGRAMS = torture_su torture_su_port \ torture_su_alloc torture_su_time torture_su_tag \ - test_htable torture_rbtree torture_heap \ + test_htable test_htable2 torture_rbtree torture_heap \ test_memmem torture_su_bm \ torture_su_root torture_su_timer \ test_su su_proxy test_poll $(OSXPROGS) @@ -28,7 +28,7 @@ TESTS = torture_su torture_su_port \ torture_su_alloc torture_su_time torture_su_tag \ - test_htable torture_rbtree torture_heap \ + test_htable test_htable2 torture_rbtree torture_heap \ test_memmem torture_su_bm \ torture_su_root torture_su_timer \ run_addrinfo run_localinfo run_test_su \ @@ -80,7 +80,11 @@ memmem.c strtoull.c strcasestr.c \ memspn.c memcspn.c memccpy.c \ inet_ntop.c inet_pton.c poll.c getopt.c \ - su_tag_ref.c su_win32_port.c + su_tag_ref.c + +# Automake 1.9 complains about missing CXX +EXTRA_DIST = su_win32_port.c \ + su_open_c_localinfo.cpp libsu_la_LIBADD = $(REPLACE_LIBADD) libsu_la_DEPENDENCIES = $(REPLACE_LIBADD) @@ -92,7 +96,7 @@ # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = su.docs \ +EXTRA_DIST += su.docs \ run_addrinfo run_localinfo run_test_su dist_pkgdata_SCRIPTS = tag_dll.awk Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/htable.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/htable.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/htable.h Mon Nov 12 11:04:47 2007 @@ -141,6 +141,8 @@ new_size = 2 * pr->pr##_size + 1; \ if (new_size < HTABLE_MIN_SIZE) \ new_size = HTABLE_MIN_SIZE; \ + if (new_size < 5 * pr->pr##_used / 4) \ + new_size = 5 * pr->pr##_used / 4; \ \ if (!(new_hash = su_zalloc(home, sizeof(*new_hash) * new_size))) \ return -1; \ @@ -170,6 +172,8 @@ \ assert(pr->pr##_used == used); \ \ + su_free(home, old_hash); \ +\ return 0; \ } \ \ Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/htable2.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/htable2.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/htable2.h Mon Nov 12 11:04:47 2007 @@ -30,8 +30,9 @@ * * Hash tables templates, take 2. * - * Note: this version can handle structures as entries, and it can be used - * without <sofia-sip/su_alloc.h>. + * Note: this version stores the given element types as entries (instead of + * always storing a pointer to element). It can be used without + * <sofia-sip/su_alloc.h>. * * This file contain a hash table template for C. The hash tables are * resizeable, and they usually contain pointers to entries. The @@ -66,21 +67,24 @@ /** Declare hash table structure type. * - * The macro HTABLE2_DECLARE() expands to a declaration for hash table - * structure. The its typedef will be <em>prefix</em><code>_t</code>, the - * field names start with @a pr. The entry type is @a entrytype. + * The macro HTABLE2_DECLARE2() expands to a declaration for hash table + * structure. The its typedef will be @a type, the field names start with @a + * pr. The entry type is @a entrytype. * + * @param type hash table typedef * @param sname name of struct - * @param prefix hash table type and function prefix * @param pr hash table field prefix * @param entrytype entry type */ +#define HTABLE2_DECLARE2(type, sname, pr, entrytype, size_t) \ +typedef struct sname { \ + size_t pr##size; \ + size_t pr##used; \ + entrytype *pr##table; \ +} type + #define HTABLE2_DECLARE(sname, prefix, pr, entrytype) \ -struct sname { \ - unsigned pr##size; \ - unsigned pr##used; \ - entrytype *pr##table; /**< Hash table itself */ \ -} + HTABLE2_DECLARE2(prefix##t, sname, pr, entrytype, unsigned) #ifndef HTABLE2_SCOPE /** Default scope for hash table functions. */ @@ -89,27 +93,30 @@ /** Prototypes for hash table * - * The macro HTABLE2_PROTOS() expands to the prototypes of hash table + * The macro HTABLE2_PROTOS2() expands to the prototypes of hash table * functions. The function and type names start with @a prefix, the field * names start with @a pr. The entry type is @a entrytype. - + * * @param type hash table typedef * @param prefix function prefix - * @param pr hash table field prefix + * @param pr hash table field prefix (not used) * @param entrytype entry type */ -#define HTABLE2_PROTOS(type, prefix, pr, entrytype) \ -HTABLE2_SCOPE int prefix##_resize(void *a, type pr[1], unsigned); \ +#define HTABLE2_PROTOS2(type, prefix, pr, entrytype, size_t) \ +HTABLE2_SCOPE int prefix##_resize(void *a, type *, size_t); \ HTABLE2_SCOPE int prefix##_is_full(type const *); \ -HTABLE2_SCOPE entrytype *prefix##_hash(type const *, hash_value_t hv); \ -HTABLE2_SCOPE entrytype *prefix##_next(type const *, entrytype *ee); \ -HTABLE2_SCOPE void prefix##_append(type *pr, entrytype e); \ -HTABLE2_SCOPE void prefix##_insert(type *pr, entrytype e); \ -HTABLE2_SCOPE int prefix##_remove(type *, entrytype const e) +HTABLE2_SCOPE entrytype *prefix##_hash(type const *, hash_value_t); \ +HTABLE2_SCOPE entrytype *prefix##_next(type const *, entrytype *); \ +HTABLE2_SCOPE entrytype *prefix##_append(type *, entrytype); \ +HTABLE2_SCOPE entrytype *prefix##_insert(type *, entrytype); \ +HTABLE2_SCOPE int prefix##_remove(type *, entrytype const) + +#define HTABLE2_PROTOS(type, prefix, pr, entrytype) \ + HTABLE2_PROTOS2(type, prefix, pr, entrytype, unsigned) /** Hash table implementation. * - * The macro HTABLE2_BODIES() expands the hash table functions. The function + * The macro HTABLE2_BODIES2() expands the hash table functions. The function * and type names start with @a prefix, the field names start with @a pr. * The entry type is @a entrytype. The function (or macro) name returning * hash value of each entry is given as @a hfun. @@ -118,25 +125,26 @@ * @param prefix function prefix for hash table * @param pr field prefix for hash table * @param entrytype type of entry element + * @param size_t size_t type * @param hfun function or macro returning hash value of entry * @param is_used function or macro returning true if entry is occupied * @param reclaim function or macro zeroing entry * @param is_equal equality test * @param halloc function allocating or freeing memory */ -#define HTABLE2_BODIES(type, prefix, pr, entrytype, \ - hfun, is_used, reclaim, is_equal, halloc) \ +#define HTABLE2_BODIES2(type, prefix, pr, entrytype, size_t, \ + hfun, is_used, reclaim, is_equal, halloc) \ /** Reallocate new hash table */ \ HTABLE2_SCOPE \ int prefix##_resize(void *realloc_arg, \ type pr[1], \ - unsigned new_size) \ + usize_t new_size) \ { \ entrytype *new_hash; \ entrytype *old_hash = pr->pr##table; \ - unsigned old_size; \ - unsigned i, j, i0; \ - unsigned again = 0, used = 0, collisions = 0; \ + usize_t old_size; \ + usize_t i, j, i0; \ + usize_t again = 0, used = 0, collisions = 0; \ \ (void)realloc_arg; \ \ @@ -144,11 +152,15 @@ new_size = 2 * pr->pr##size + 1; \ if (new_size < HTABLE2_MIN_SIZE) \ new_size = HTABLE2_MIN_SIZE; \ + if (new_size < 5 * pr->pr##used / 4) \ + new_size = 5 * pr->pr##used / 4; \ \ if (!(new_hash = halloc(realloc_arg, NULL, sizeof(*new_hash) * new_size))) \ return -1; \ \ - memset(new_hash, 0, sizeof(*new_hash) * new_size); \ + for (i = 0; i < new_size; i++) { \ + (reclaim(&new_hash[i])); \ + } \ old_size = pr->pr##size; \ \ do for (j = 0; j < old_size; j++) { \ @@ -202,24 +214,34 @@ } \ \ HTABLE2_SCOPE \ -void prefix##_append(type *pr, entrytype e) \ +entrytype *prefix##_append(type *pr, entrytype e) \ { \ entrytype *ee; \ \ + assert(pr->pr##used < pr->pr##size); \ + if (pr->pr##used == pr->pr##size) \ + return (entrytype *)0; \ +\ pr->pr##used++; \ for (ee = prefix##_hash(pr, hfun(e)); \ is_used(*ee); \ ee = prefix##_next(pr, ee)) \ ; \ *ee = e; \ +\ + return ee; \ } \ \ HTABLE2_SCOPE \ -void prefix##_insert(type *pr, entrytype e) \ +entrytype *prefix##_insert(type *pr, entrytype e) \ { \ entrytype e0; \ entrytype *ee; \ \ + assert(pr->pr##used < pr->pr##size); \ + if (pr->pr##used == pr->pr##size) \ + return (entrytype *)0; \ +\ pr->pr##used++; \ /* Insert entry into hash table (before other entries with same hash) */ \ for (ee = prefix##_hash(pr, hfun(e)); \ @@ -227,12 +249,14 @@ ee = prefix##_next(pr, ee)) \ *ee = e, e = e0; \ *ee = e; \ +\ + return ee; \ } \ \ HTABLE2_SCOPE \ int prefix##_remove(type *pr, entrytype const e) \ { \ - unsigned i, j, k, size = pr->pr##size; \ + usize_t i, j, k, size = pr->pr##size; \ entrytype *htable = pr->pr##table; \ \ /* Search for entry */ \ @@ -263,4 +287,10 @@ } \ extern int const prefix##_dummy +#define HTABLE2_BODIES(type, prefix, pr, entrytype, \ + hfun, is_used, reclaim, is_equal, halloc) \ + HTABLE2_BODIES2(type, prefix, pr, entrytype, unsigned, \ + hfun, is_used, reclaim, is_equal, halloc) + + #endif /** !defined(HTABLE2_H) */ Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/tstdef.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/tstdef.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/tstdef.h Mon Nov 12 11:04:47 2007 @@ -319,13 +319,13 @@ /** @HIDE */ #define TEST_M_(flags, suite, expect, len) do { \ void const * _value, * _expect; \ - int _len; \ + size_t _len; \ if (flags & tst_verbatim) { \ printf("%s: %s%stesting %s is %s\n", TSTNAME, #suite, #expect); \ fflush(stdout); } \ _value = (suite); \ _expect = (expect); \ - _len = (len); \ + _len = (size_t)(len); \ if (((_value == NULL || _expect == NULL) && _value == _expect) || \ memcmp(_value, _expect, _len) == 0) \ { if (flags & tst_verbatim) \ @@ -333,7 +333,8 @@ fprintf(stderr, "%s:%u: %s %s%sFAILED: %s != %s "\ "or \"%.*s\" != \"%.*s\"\n", \ __FILE__, __LINE__, TSTNAME, \ - #suite, #expect, _len, (char *)_value, _len, (char *)_expect); \ + #suite, #expect, (int)_len, \ + (char *)_value, (int)_len, (char *)_expect); \ fflush(stderr); \ TEST_FAILED(flags); \ } while(0) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Mon Nov 12 11:04:47 2007 @@ -915,6 +915,11 @@ * @retval -1 upon an error. * * @sa SU_HOME_INIT(), su_home_deinit(), su_home_new(), su_home_clone() + * + * @bug + * Prior to @VERSION_1_12_8 the su_home_t structure should have been + * initialized with SU_HOME_INIT() or otherwise zeroed before calling + * su_home_init(). */ int su_home_init(su_home_t *home) { @@ -924,6 +929,8 @@ return -1; home->suh_blocks = sub = su_hash_alloc(SUB_N); + home->suh_lock = NULL; + if (!sub) return -1; Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_htable.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_htable.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_htable.c Mon Nov 12 11:04:47 2007 @@ -157,18 +157,23 @@ su_free(c->c_home, e); } +/* + * Check that all n entries with hash h are in hash table + * and they are stored in same order + * in which they were added to the hash + */ static unsigned long count(context_t *c, hash_value_t h) { entry_t *e, **ee; - unsigned long n; + unsigned long n, expect = 1; for (ee = htable_hash(c->c_hash, h), n = 0; (e = *ee); ee = htable_next(c->c_hash, ee)) { if (e->e_value != h) continue; - if (e->e_n == n) - n++; + if (e->e_n == expect) + n++, expect++; } return n; @@ -218,9 +223,9 @@ for correct ordering */ hash_value_t size = c->c_hash->ht_size, h = size - 1; - TEST_1(add(c, h, 0)); TEST_1(add(c, h, 1)); TEST_1(add(c, h, 2)); - TEST_1(add(c, h, 3)); TEST_1(add(c, h, 4)); TEST_1(add(c, h, 5)); - TEST_1(add(c, h, 6)); TEST_1(add(c, h, 7)); TEST_1(add(c, h, 8)); + TEST_1(add(c, h, 1)); TEST_1(add(c, h, 2)); TEST_1(add(c, h, 3)); + TEST_1(add(c, h, 4)); TEST_1(add(c, h, 5)); TEST_1(add(c, h, 6)); + TEST_1(add(c, h, 7)); TEST_1(add(c, h, 8)); TEST_1(add(c, h, 9)); TEST(count(c, h), 9); Added: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_htable2.c ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_htable2.c Mon Nov 12 11:04:47 2007 @@ -0,0 +1,267 @@ +/* + * This file is part of the Sofia-SIP package + * + * Copyright (C) 2005 Nokia Corporation. + * + * Contact: Pekka Pessi <pekka.pessi@nokia.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA + * + */ + +/**@ingroup su_htable + * + * @CFILE test_htable.c + * + * Test functions for the @b su library hash table implementation. + * + * @internal + * + * @author Pekka Pessi <Pekka.Pessi@nokia.com> + * + * @date Created: Tue Aug 21 15:18:26 2001 ppessi + */ + +#include "config.h" + +#include <stddef.h> +#include <stdlib.h> +#include <string.h> +#include <limits.h> +#include <stdio.h> +#include <assert.h> + +#include "sofia-sip/su_alloc.h" +#include "sofia-sip/htable2.h" + +#define TSTFLAGS flags +#include <sofia-sip/tstdef.h> + +char const name[] = "test_htable2"; + +void usage(int exitcode) +{ + fprintf(stderr, "usage: %s [-v|--verbatim] [-a|--abort]\n", name); + exit(exitcode); +} + +static int table2_test(int flags); + +int main(int argc, char *argv[]) +{ + int flags = 0; + + int retval = 0; + int i; + + for (i = 1; argv[i]; i++) { + if (strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "--verbatim") == 0) + flags |= tst_verbatim; + else if (strcmp(argv[i], "-a") == 0 || strcmp(argv[i], "--abort") == 0) + flags |= tst_abort; + else + usage(1); + } + + retval |= table2_test(flags); fflush(stdout); + + return retval; +} + +typedef struct hentry_s entry_t; + +HTABLE2_DECLARE2(htable2_t, htable2_s, ht2_, entry_t, size_t); +HTABLE2_PROTOS2(htable2_t, htable2, ht2_, entry_t, size_t); + +struct hentry_s +{ + unsigned long e_hash; + unsigned long e_n; +}; + +#define HENTRY_HASH(e) ((e).e_hash) +#define HENTRY_IS_USED(e) ((e).e_n != 0) +#define HENTRY_REMOVE(e) ((e)->e_n = 0, (e)->e_hash = 0) +#define HENTRY_IS_EQUAL(a, b) ((a).e_n == (b).e_n) +#define HALLOC(home, old, newsize) (su_realloc(home, old, newsize)) + +HTABLE2_BODIES2(htable2_t, htable2, ht2_, entry_t, size_t, + HENTRY_HASH, HENTRY_IS_USED, HENTRY_REMOVE, HENTRY_IS_EQUAL, + HALLOC); + +typedef struct context_s +{ + su_home_t c_home[1]; + htable2_t c_hash[1]; +} context_t; + +context_t *context_create(void) +{ + context_t *c = su_home_clone(NULL, sizeof(*c)); + + if (c) + htable2_resize(c->c_home, c->c_hash, 0); + + return c; +} + +static +entry_t *search(context_t *c, unsigned long value, unsigned long n, int add) +{ + htable2_t *ht = c->c_hash; + entry_t *e; + unsigned long hash = value; + + /* Search for entry in hash table */ + for (e = htable2_hash(ht, hash); + e->e_n != 0; + e = htable2_next(ht, e)) { + if (e->e_hash == value && e->e_n == n) + return e; + } + + if (add) { + entry_t entry; + + /* Resize hash table */ + if (htable2_is_full(ht)) { + htable2_resize(c->c_home, ht, 0); + fprintf(stderr, "htable: resized to "MOD_ZU" with "MOD_ZU" entries\n", + ht->ht2_size, ht->ht2_used); + } + + /* Add an entry */ + e = &entry, e->e_hash = value, e->e_n = n; + + return htable2_append(ht, *e); + } + + return NULL; +} + +static int add(context_t *c, unsigned long value, unsigned long n) +{ + return search(c, value, n, 1) != NULL; +} + +static +void zap(context_t *c, entry_t e) +{ + htable2_remove(c->c_hash, e); +} + +/* + * Check that all n entries with hash h are in hash table + * and they are stored in same order + * in which they were added to the hash + */ +static unsigned long count(context_t *c, hash_value_t h) +{ + entry_t *e; + unsigned long n; + unsigned long expect = 1; + + for (e = htable2_hash(c->c_hash, h), n = 0; + e->e_n != 0; + e = htable2_next(c->c_hash, e)) { + if (e->e_hash != h) + continue; + if (e->e_n == expect) + n++, expect++; + } + + return n; +} + +int table2_test(int flags) +{ + context_t *c; + entry_t *e, e0; + + BEGIN(); + + TEST_1(c = context_create()); + TEST_1(add(c, 0, 1)); TEST_1(c->c_hash->ht2_table[0].e_n == 1); + TEST_1(add(c, 1, 2)); TEST_1(c->c_hash->ht2_table[1].e_n == 2); + TEST_1(add(c, 2, 3)); TEST_1(c->c_hash->ht2_table[2].e_n == 3); + TEST_1(add(c, 0, 4)); TEST_1(c->c_hash->ht2_table[3].e_n == 4); + TEST_1(add(c, 2, 5)); TEST_1(c->c_hash->ht2_table[4].e_n == 5); + + TEST_1(e = search(c, 1, 2, 0)); + e0 = *e; + TEST(htable2_remove(c->c_hash, e0), 0); + TEST(htable2_remove(c->c_hash, e0), -1); + + /* after remove , 4 is mode to [1], 5 to [4] */ + TEST(c->c_hash->ht2_table[0].e_n, 1); + TEST(c->c_hash->ht2_table[1].e_n, 4); + TEST(c->c_hash->ht2_table[2].e_n, 3); + TEST(c->c_hash->ht2_table[3].e_n, 5); + TEST(c->c_hash->ht2_table[4].e_n, 0); + + zap(c, c->c_hash->ht2_table[0]); + + /* after remove , 4 is mode to [1], 5 to [4] */ + TEST(c->c_hash->ht2_table[0].e_n, 4); + TEST(c->c_hash->ht2_table[1].e_n, 0); + TEST(c->c_hash->ht2_table[2].e_n, 3); + TEST(c->c_hash->ht2_table[3].e_n, 5); + TEST(c->c_hash->ht2_table[4].e_n, 0); + + TEST_1(add(c, 0, 6)); TEST(c->c_hash->ht2_table[1].e_n, 6); + TEST_1(add(c, 1, 7)); TEST(c->c_hash->ht2_table[4].e_n, 7); + + /* Test that zapping entry 0 does not move 2 and 3 */ + zap(c, c->c_hash->ht2_table[0]); + TEST(c->c_hash->ht2_table[4].e_n, 0); + + { + /* Insert entries at the end of hash, then resize and check + for correct ordering */ + size_t size = c->c_hash->ht2_size; + hash_value_t h = (hash_value_t)size - 1; + + TEST_1(add(c, h, 1)); TEST_1(add(c, h, 2)); TEST_1(add(c, h, 3)); + TEST_1(add(c, h, 4)); TEST_1(add(c, h, 5)); TEST_1(add(c, h, 6)); + TEST_1(add(c, h, 7)); TEST_1(add(c, h, 8)); TEST_1(add(c, h, 9)); + + TEST(count(c, h), 9); + + TEST(htable2_resize(c->c_home, c->c_hash, ++size), 0); + TEST(count(c, h), 9); + TEST(htable2_resize(c->c_home, c->c_hash, ++size), 0); + TEST(count(c, h), 9); + TEST(htable2_resize(c->c_home, c->c_hash, ++size), 0); + TEST(count(c, h), 9); + TEST(htable2_resize(c->c_home, c->c_hash, ++size), 0); + TEST(count(c, h), 9); + TEST(htable2_resize(c->c_home, c->c_hash, ++size), 0); + TEST(count(c, h), 9); + TEST(htable2_resize(c->c_home, c->c_hash, ++size), 0); + TEST(count(c, h), 9); + TEST(htable2_resize(c->c_home, c->c_hash, ++size), 0); + TEST(count(c, h), 9); + TEST(htable2_resize(c->c_home, c->c_hash, ++size), 0); + TEST(count(c, h), 9); + TEST(htable2_resize(c->c_home, c->c_hash, ++size), 0); + TEST(count(c, h), 9); + } + + TEST_VOID(su_home_unref(c->c_home)); + + END(); +} + 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 Mon Nov 12 11:04:47 2007 @@ -52,7 +52,7 @@ #include <assert.h> -char const name[] = "su_test"; +char const name[] = "test_su"; #if HAVE_FUNC #define enter (void)SU_DEBUG_9(("%s: %s: entering\n", name, __func__)) @@ -64,7 +64,7 @@ #else #define enter ((void)0) #define nh_enter ((void)0) -#define __func__ "su_test" +#define __func__ "test_su" #endif struct pinger { Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_alloc.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_alloc.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_alloc.c Mon Nov 12 11:04:47 2007 @@ -69,6 +69,7 @@ { exhome_t *h0, *h1, *h2, *h3; su_home_t home[1] = { SU_HOME_INIT(home) }; + su_home_t home0[1]; enum { N = 40 }; void *m0[N], *m1[N], *m; char *c, *c0, *p0, *p1; @@ -78,6 +79,11 @@ BEGIN(); + /* su_home_init() was not initializing suh_locks */ + memset(home0, 0xff, sizeof home0); + TEST(su_home_init(home0), 0); + TEST_VOID(su_home_deinit(home0)); + TEST_1(h0 = su_home_new(sizeof(*h0))); TEST_1(h1 = su_home_clone(h0->home, sizeof(*h1))); 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 Mon Nov 12 11:04:47 2007 @@ -165,6 +165,8 @@ { root_test_t *rt = _rt; + su_init(); + pthread_mutex_lock(rt->rt_sr.mutex); rt->rt_root = su_root_create(rt); rt->rt_sr.done = 1; @@ -177,6 +179,9 @@ su_root_destroy(rt->rt_root); rt->rt_root = NULL; pthread_mutex_unlock(rt->rt_sr.deinit); + + su_deinit(); + return NULL; } #endif @@ -192,8 +197,6 @@ BEGIN(); - su_init(); - su_port_prefer(create, start); #if SU_HAVE_PTHREADS @@ -257,8 +260,6 @@ TEST_VOID(su_root_destroy(rt->rt_root)); rt->rt_root = NULL; #endif - su_deinit(); - END(); } @@ -724,6 +725,8 @@ i = 0; + su_init(); + do { rt = rt1, *rt = *rt0; @@ -739,5 +742,7 @@ retval |= deinit_test(rt); } while (prefer[++i].create); + su_deinit(); + return retval; } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/test_tport.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/test_tport.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/test_tport.c Mon Nov 12 11:04:47 2007 @@ -824,7 +824,7 @@ BEGIN(); msg_t *msg = NULL; - int i; + int i, N; tport_t *tp, *tp0; char ident[16]; su_time_t started; @@ -853,12 +853,15 @@ pending_server_close = tport_pend(tp, NULL, server_closed_callback, NULL); TEST_1(pending_server_close > 0); + N = 0; tt->tt_received = 0; + #ifndef WIN32 /* Windows seems to be buffering too much */ /* Create a large message, just to force queueing in sending end */ TEST(new_test_msg(tt, &msg, "tcp-0", 1, 16 * 64 * 1024), 0); test_create_md5(tt, msg); TEST_1(tp = tport_tsend(tt->tt_tports, msg, tt->tt_tcp_name, TAG_END())); + N++; TEST_S(tport_name(tp)->tpn_ident, "client"); TEST_P(tport_incref(tp), tp0); tport_decref(&tp); msg_destroy(msg); @@ -869,6 +872,7 @@ TEST(new_test_msg(tt, &msg, ident, 1, 64 * 1024), 0); TEST_1(tp = tport_tsend(tt->tt_tports, msg, tt->tt_tcp_name, TAG_END())); + N++; TEST_S(tport_name(tp)->tpn_ident, "client"); TEST_P(tport_incref(tp), tp0); tport_decref(&tp); msg_destroy(msg); @@ -879,8 +883,6 @@ TEST_1(!tport_tsend(tt->tt_tports, msg, tt->tt_tcp_name, TAG_END())); msg_destroy(msg); - tt->tt_received = 0; - TEST(tport_test_run(tt, 60), 1); TEST_1(!check_msg(tt, tt->tt_rmsg, "tcp-0")); test_check_md5(tt, tt->tt_rmsg); @@ -892,13 +894,15 @@ TEST_1(!check_msg(tt, tt->tt_rmsg, ident)); msg_destroy(tt->tt_rmsg), tt->tt_rmsg = NULL; } - +#else + (void)i; (void)ident; #endif /* This uses a new connection */ TEST_1(!new_test_msg(tt, &msg, "tcp-no-reuse", 1, 1024)); TEST_1(tp = tport_tsend(tt->tt_tports, msg, tt->tt_tcp_name, TPTAG_REUSE(0), TAG_END())); + N++; TEST_S(tport_name(tp)->tpn_ident, "client"); TEST_1(tport_incref(tp) != tp0); tport_decref(&tp); msg_destroy(msg); @@ -907,12 +911,13 @@ TEST_1(!new_test_msg(tt, &msg, "tcp-reuse", 1, 1024)); TEST_1(tp = tport_tsend(tt->tt_tports, msg, tt->tt_tcp_name, TPTAG_REUSE(1), TAG_END())); + N++; TEST_S(tport_name(tp)->tpn_ident, "client"); TEST_1(tport_incref(tp) == tp0); tport_decref(&tp); msg_destroy(msg); /* Receive every message from queue */ - while (tt->tt_received < TPORT_QUEUESIZE + 2) { + while (tt->tt_received < N) { TEST(tport_test_run(tt, 5), 1); /* Validate message */ TEST_1(!check_msg(tt, tt->tt_rmsg, NULL)); @@ -1005,7 +1010,7 @@ s = su_socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); TEST_1(s != SOCKET_ERROR); - connected = connect(s, ai->ai_addr, ai->ai_addrlen); + connected = connect(s, ai->ai_addr, (socklen_t)ai->ai_addrlen); su_root_step(tt->tt_root, 50); Added: freeswitch/trunk/libs/sofia-sip/open_c/Makefile.am ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/open_c/Makefile.am Mon Nov 12 11:04:47 2007 @@ -0,0 +1,46 @@ +# +# Makefile.am for sofia-sip/open_c +# +# This is used for including Open C files in dist +# +# Copyright (C) 2007 Nokia Corporation +# Contact: Pekka Pessi <pekka.pessi@nokia.com> +# Licensed under LGPL. See file COPYING. +# +# ref: http://www.gnu.org/software/automake/manual/automake.html + +EXTRA_DIST = autogen.cmd build_sources.cmd version.awk version_files.cmd + +EXTRA_DIST += config.h.in config.h sofia-sip/su_configure.h + +EXTRA_DIST += group/bld.inf +EXTRA_DIST += group/libsofia-sip-ua-glib.mmp +EXTRA_DIST += group/libsofia-sip-ua.mmp +EXTRA_DIST += group/su_source_test.mmp +EXTRA_DIST += group/su_source_test_reg.rss +EXTRA_DIST += group/test_http.mmp +EXTRA_DIST += group/test_http_reg.rss +EXTRA_DIST += group/test_msg.mmp +EXTRA_DIST += group/test_msg_reg.rss +EXTRA_DIST += group/test_nua.mmp +EXTRA_DIST += group/test_nua_reg.rss +EXTRA_DIST += group/test_tport.mmp +EXTRA_DIST += group/test_tport_reg.rss +EXTRA_DIST += group/torture_sip.mmp +EXTRA_DIST += group/torture_sip_reg.rss +EXTRA_DIST += group/torture_su_alloc.mmp +EXTRA_DIST += group/torture_su_alloc_reg.rss +EXTRA_DIST += group/torture_su_port.mmp +EXTRA_DIST += group/torture_su_port_reg.rss +EXTRA_DIST += group/torture_su_root.mmp +EXTRA_DIST += group/torture_su_root_reg.rss +EXTRA_DIST += group/torture_su_tag.mmp +EXTRA_DIST += group/torture_su_tag_reg.rss +EXTRA_DIST += group/torture_url.mmp +EXTRA_DIST += group/torture_url_reg.rss + +EXTRA_DIST += sis/libsofia-sip-ua-glib.pkg +EXTRA_DIST += sis/libsofia-sip-ua.pkg +EXTRA_DIST += sis/su_source_test.pkg +EXTRA_DIST += sis/test_nua.pkg +EXTRA_DIST += sis/test_tport.pkg Modified: freeswitch/trunk/libs/sofia-sip/open_c/build_sources.cmd ============================================================================== --- freeswitch/trunk/libs/sofia-sip/open_c/build_sources.cmd (original) +++ freeswitch/trunk/libs/sofia-sip/open_c/build_sources.cmd Mon Nov 12 11:04:47 2007 @@ -44,6 +44,8 @@ PT=%PT% %IN% < NUL %CHECK% +@set AWK_SIP_AWK=%MSG_AWK% module=sip + @set IN=../libsofia-sip-ua/sip/sofia-sip/sip.h @set PR=../libsofia-sip-ua/sip/sip_tag.c @set PR2=../libsofia-sip-ua/sip/sofia-sip/sip_hclasses.h @@ -53,20 +55,25 @@ @set SIPEXTRA=../libsofia-sip-ua/sip/sip_extra_headers.txt @set PT=../libsofia-sip-ua/sip/sip_parser_table.c -%MSG_AWK% module=sip PR=%PR% %IN% < NUL +%AWK_SIP_AWK% PR=%PR% %IN% %SIPEXTRA% < NUL %CHECK% -%MSG_AWK% module=sip PR=%PR2% %IN% < NUL +%AWK_SIP_AWK% PR=%PR2% %IN% < NUL %CHECK% -%MSG_AWK% module=sip PR=%PR3% %IN% < NUL +%AWK_SIP_AWK% PR=%PR3% %IN% < NUL %CHECK% -%MSG_AWK% module=sip PR=%PR4% %IN% < NUL +%AWK_SIP_AWK% PR=%PR4% %IN% < NUL %CHECK% -%MSG_AWK% module=sip PR=%PR5% TEMPLATE1=%PR2%.in TEMPLATE2=%PR3%.in TEMPLATE=%PR5%.in NO_FIRST=1 NO_LAST=1 < NUL %SIPEXTRA% +%AWK_SIP_AWK% PR=%PR5% NO_FIRST=1 NO_LAST=1 ^ + TEMPLATE1=%PR2%.in ^ + TEMPLATE2=%PR3%.in ^ + TEMPLATE3=%PR4%.in ^ + TEMPLATE=%PR5%.in %SIPEXTRA% < NUL %CHECK% -%MSG_AWK% module=sip MC_HASH_SIZE=127 MC_SHORT_SIZE=26 ^ +%AWK_SIP_AWK% PT=%PT% TEMPLATE=%PT%.in ^ FLAGFILE=../libsofia-sip-ua/sip/sip_bad_mask ^ - PT=%PT% %IN% < NUL + MC_HASH_SIZE=127 MC_SHORT_SIZE=26 ^ + %IN% %SIPEXTRA% < NUL %CHECK% @set IN=../libsofia-sip-ua/http/sofia-sip/http.h @@ -110,8 +117,6 @@ %CHECK% %TAG_AWK% NO_DLL=1 %P%/tport/tport_tag.c < NUL %CHECK% -%TAG_AWK% NO_DLL=1 %P%/su/su_tag.c < NUL -%CHECK% %TAG_AWK% NO_DLL=1 %P%/url/url_tag.c < NUL %CHECK% Modified: freeswitch/trunk/libs/sofia-sip/open_c/config.h.in ============================================================================== --- freeswitch/trunk/libs/sofia-sip/open_c/config.h.in (original) +++ freeswitch/trunk/libs/sofia-sip/open_c/config.h.in Mon Nov 12 11:04:47 2007 @@ -1,10 +1,4 @@ -/* config.h. Generated by configure. */ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP - systems. This function is required for `alloca.c' support on those systems. - */ -/* #undef CRAY_STACKSEG_END */ +/* config.h.in. Template for Open C */ /* Define to 1 if using `alloca.c'. */ /* #undef C_ALLOCA */ @@ -441,4 +435,4 @@ /* #undef size_t */ /* Define to 1 if compiling on Open C environment */ -#define HAVE_OPEN_C 1 \ No newline at end of file +#define HAVE_OPEN_C 1 Modified: freeswitch/trunk/libs/sofia-sip/win32/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/win32/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/win32/Makefile.am Mon Nov 12 11:04:47 2007 @@ -37,6 +37,7 @@ tests/torture_su_port/torture_su_port.dsp \ utils/localinfo/localinfo.dsp \ utils/sip_options/sip_options.dsp \ + utils/sip_options_static/sip_options_static.dsp \ utils/sip_dig/sip_dig.dsp \ utils/stunc/stunc.dsp \ $(PTHREAD_DIST) \ Modified: freeswitch/trunk/libs/sofia-sip/win32/build_sources.cmd ============================================================================== --- freeswitch/trunk/libs/sofia-sip/win32/build_sources.cmd (original) +++ freeswitch/trunk/libs/sofia-sip/win32/build_sources.cmd Mon Nov 12 11:04:47 2007 @@ -44,6 +44,8 @@ PT=%PT% %IN% < NUL %CHECK% +@set AWK_SIP_AWK=%MSG_AWK% module=sip + @set IN=../libsofia-sip-ua/sip/sofia-sip/sip.h @set PR=../libsofia-sip-ua/sip/sip_tag.c @set PR2=../libsofia-sip-ua/sip/sofia-sip/sip_hclasses.h @@ -53,20 +55,25 @@ @set SIPEXTRA=../libsofia-sip-ua/sip/sip_extra_headers.txt @set PT=../libsofia-sip-ua/sip/sip_parser_table.c -%MSG_AWK% module=sip PR=%PR% %IN% < NUL +%AWK_SIP_AWK% PR=%PR% %IN% %SIPEXTRA% < NUL %CHECK% -%MSG_AWK% module=sip PR=%PR2% %IN% < NUL +%AWK_SIP_AWK% PR=%PR2% %IN% < NUL %CHECK% -%MSG_AWK% module=sip PR=%PR3% %IN% < NUL +%AWK_SIP_AWK% PR=%PR3% %IN% < NUL %CHECK% -%MSG_AWK% module=sip PR=%PR4% %IN% < NUL +%AWK_SIP_AWK% PR=%PR4% %IN% < NUL %CHECK% -%MSG_AWK% module=sip PR=%PR5% TEMPLATE1=%PR2%.in TEMPLATE2=%PR3%.in TEMPLATE3=%PR4%.in TEMPLATE=%PR5%.in NO_FIRST=1 NO_LAST=1 < NUL %SIPEXTRA% +%AWK_SIP_AWK% PR=%PR5% NO_FIRST=1 NO_LAST=1 ^ + TEMPLATE1=%PR2%.in ^ + TEMPLATE2=%PR3%.in ^ + TEMPLATE3=%PR4%.in ^ + TEMPLATE=%PR5%.in %SIPEXTRA% < NUL %CHECK% -%MSG_AWK% module=sip TEMPLATE=%PT%.in MC_HASH_SIZE=127 MC_SHORT_SIZE=26 ^ +%AWK_SIP_AWK% PT=%PT% TEMPLATE=%PT%.in ^ FLAGFILE=../libsofia-sip-ua/sip/sip_bad_mask ^ - PT=%PT% %IN% %SIPEXTRA% < NUL + MC_HASH_SIZE=127 MC_SHORT_SIZE=26 ^ + %IN% %SIPEXTRA% < NUL %CHECK% @set IN=../libsofia-sip-ua/http/sofia-sip/http.h Modified: freeswitch/trunk/libs/sofia-sip/win32/check.cmd ============================================================================== --- freeswitch/trunk/libs/sofia-sip/win32/check.cmd (original) +++ freeswitch/trunk/libs/sofia-sip/win32/check.cmd Mon Nov 12 11:04:47 2007 @@ -21,47 +21,51 @@ :: Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA :: 02110-1301 USA :: -tests\torture_su_alloc\Debug\torture_su_alloc.exe + +set config=\Debug\ +:: set config=\Release\ + +tests\torture_su_alloc%config%torture_su_alloc.exe -a @if errorlevel 1 ( echo torture_su_alloc: FAIL ) else echo torture_su_alloc: PASS -tests\torture_su_root\Debug\torture_su_root.exe +tests\torture_su_root%config%torture_su_root.exe -a @if errorlevel 1 ( echo torture_su_root: FAIL ) else echo torture_su_root: PASS -tests\torture_su_tag\Debug\torture_su_tag.exe +tests\torture_su_tag%config%torture_su_tag.exe -a @if errorlevel 1 ( echo torture_su_tag: FAIL ) else echo torture_su_tag: PASS -tests\test_su\Debug\test_su.exe +tests\test_su%config%test_su.exe @if errorlevel 1 ( echo test_su: FAIL ) else echo test_su: PASS -tests\torture_su_time\Debug\torture_su_time.exe +tests\torture_su_time%config%torture_su_time.exe -a @if errorlevel 1 ( echo torture_su_time: FAIL ) else echo torture_su_time: PASS -tests\torture_su_timer\Debug\torture_su_timer.exe +tests\torture_su_timer%config%torture_su_timer.exe @if errorlevel 1 ( echo torture_su_timer: FAIL ) else echo torture_su_timer: PASS -tests\torture_su\Debug\torture_su.exe +tests\torture_su%config%torture_su.exe -a @if errorlevel 1 ( echo torture_su: FAIL ) else echo torture_su: PASS -tests\test_memmem\Debug\test_memmem.exe +tests\test_memmem%config%test_memmem.exe -a @if errorlevel 1 ( echo test_memmem: FAIL ) else echo test_memmem: PASS -tests\test_tport\Debug\test_tport.exe +tests\test_tport%config%test_tport.exe -a @if errorlevel 1 ( echo test_tport: FAIL ) else echo test_tport: PASS -tests\test_nta\Debug\test_nta.exe +tests\test_nta%config%test_nta.exe -a @if errorlevel 1 ( echo test_nta: FAIL ) else echo test_nta: PASS -tests\test_nua\Debug\test_nua.exe +tests\test_nua%config%test_nua.exe -a @if errorlevel 1 ( echo test_nua: FAIL ) else echo test_nua: PASS -tests\test_htable\Debug\test_htable.exe +tests\test_htable%config%test_htable.exe -a @if errorlevel 1 ( echo test_htable: FAIL ) else echo test_htable: PASS -tests\torture_rbtree\Debug\torture_rbtree.exe +tests\torture_rbtree%config%torture_rbtree.exe -a @if errorlevel 1 ( echo torture_rbtree: FAIL ) else echo torture_rbtree: PASS -tests\torture_su_bm\Debug\torture_su_bm.exe +tests\torture_su_bm%config%torture_su_bm.exe -a @if errorlevel 1 ( echo torture_su_bm: FAIL ) else echo torture_su_bm: PASS -:: tests\torture_su_port\Debug\torture_su_port.exe +:: tests\torture_su_port%config%torture_su_port.exe -a :: @if errorlevel 1 ( echo torture_su_port: FAIL ) else echo torture_su_port: PASS Modified: freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua/libsofia_sip_ua.dsp ============================================================================== --- freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua/libsofia_sip_ua.dsp (original) +++ freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua/libsofia_sip_ua.dsp Mon Nov 12 11:04:47 2007 @@ -109,6 +109,10 @@ # End Source File # Begin Source File +SOURCE="..\..\libsofia-sip-ua\su\smoothsort.c" +# End Source File +# Begin Source File + SOURCE="..\..\libsofia-sip-ua\su\string0.c" # End Source File # Begin Source File @@ -837,10 +841,6 @@ # End Source File # Begin Source File -SOURCE="..\..\libsofia-sip-ua\soa\sofia-sip\soa_session.h" -# End Source File -# Begin Source File - SOURCE="..\..\libsofia-sip-ua\soa\soa_static.c" # End Source File # Begin Source File @@ -861,6 +861,10 @@ # PROP Default_Filter "su*.h" # Begin Source File +SOURCE="..\..\libsofia-sip-ua\su\sofia-sip\heap.h" +# End Source File +# Begin Source File + SOURCE="..\..\libsofia-sip-ua\su\sofia-sip\htable.h" # End Source File # Begin Source File @@ -1389,6 +1393,10 @@ # End Source File # Begin Source File +SOURCE="..\..\libsofia-sip-ua\soa\sofia-sip\soa_session.h" +# End Source File +# Begin Source File + SOURCE="..\..\libsofia-sip-ua\soa\sofia-sip\soa_tag.h" # End Source File # End Group Modified: freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua/libsofia_sip_ua.vcproj ============================================================================== --- freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua/libsofia_sip_ua.vcproj (original) +++ freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua/libsofia_sip_ua.vcproj Mon Nov 12 11:04:47 2007 @@ -272,6 +272,10 @@ </FileConfiguration> </File> <File + RelativePath="..\..\libsofia-sip-ua\su\smoothsort.c" + > + </File> + <File RelativePath="..\..\libsofia-sip-ua\su\string0.c" > </File> @@ -3758,10 +3762,6 @@ </FileConfiguration> </File> <File - RelativePath="..\..\libsofia-sip-ua\soa\sofia-sip\soa_session.h" - > - </File> - <File RelativePath="..\..\libsofia-sip-ua\soa\soa_static.c" > <FileConfiguration @@ -3838,6 +3838,10 @@ Filter="su*.h" > <File + RelativePath="..\..\libsofia-sip-ua\su\sofia-sip\heap.h" + > + </File> + <File RelativePath="..\..\libsofia-sip-ua\su\sofia-sip\htable.h" > </File> @@ -4373,6 +4377,10 @@ > </File> <File + RelativePath="..\..\libsofia-sip-ua\soa\sofia-sip\soa_session.h" + > + </File> + <File RelativePath="..\..\libsofia-sip-ua\soa\sofia-sip\soa_tag.h" > </File> Modified: freeswitch/trunk/libs/sofia-sip/win32/tests/torture_su_root/torture_su_root.dsp ============================================================================== --- freeswitch/trunk/libs/sofia-sip/win32/tests/torture_su_root/torture_su_root.dsp (original) +++ freeswitch/trunk/libs/sofia-sip/win32/tests/torture_su_root/torture_su_root.dsp Mon Nov 12 11:04:47 2007 @@ -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" /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 "..\..\pthread" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c # ADD BASE RSC /l 0x40b /d "NDEBUG" # ADD RSC /l 0x40b /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" /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 "..\..\pthread" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x40b /d "_DEBUG" # ADD RSC /l 0x40b /d "_DEBUG" Modified: freeswitch/trunk/libs/sofia-sip/win32/tests/torture_su_root/torture_su_root.vcproj ============================================================================== --- freeswitch/trunk/libs/sofia-sip/win32/tests/torture_su_root/torture_su_root.vcproj (original) +++ freeswitch/trunk/libs/sofia-sip/win32/tests/torture_su_root/torture_su_root.vcproj Mon Nov 12 11:04:47 2007 @@ -44,7 +44,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..,..\..\..\libsofia-sip-ua\su" + AdditionalIncludeDirectories="..\..,..\..\..\libsofia-sip-ua\su,..\..\pthread" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -140,7 +140,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..,..\..\..\libsofia-sip-ua\su" + AdditionalIncludeDirectories="..\..,..\..\..\libsofia-sip-ua\su,..\..\pthread" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" StringPooling="true" RuntimeLibrary="2" Modified: freeswitch/trunk/libs/sofia-sip/win32/utils/stunc/stunc.dsp ============================================================================== --- freeswitch/trunk/libs/sofia-sip/win32/utils/stunc/stunc.dsp (original) +++ freeswitch/trunk/libs/sofia-sip/win32/utils/stunc/stunc.dsp Mon Nov 12 11:04:47 2007 @@ -43,7 +43,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /WX /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /c -# ADD CPP /nologo /MD /W3 /WX /GX /O2 /I ".." /I "..\.." /I "..\..\..\libsofia-sip-ua\su" /I "..\..\..\libsofia-sip-ua\features" /I "..\..\..\libsofia-sip-ua\tport" /I "..\..\..\libsofia-sip-ua\iptsec" /I "..\..\..\libsofia-sip-ua\ipt" /I "..\..\..\libsofia-sip-ua\url" /I "..\..\..\libsofia-sip-ua\nta" /I "..\..\..\libsofia-sip-ua\msg" /I "..\..\..\libsofia-sip-ua\sip" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /WX /GX /O2 /I ".." /I "..\.." /I "..\..\..\libsofia-sip-ua\su" /I "..\..\..\libsofia-sip-ua\features" /I "..\..\..\libsofia-sip-ua\tport" /I "..\..\..\libsofia-sip-ua\iptsec" /I "..\..\..\libsofia-sip-ua\ipt" /I "..\..\..\libsofia-sip-ua\url" /I "..\..\..\libsofia-sip-ua\nta" /I "..\..\..\libsofia-sip-ua\stun" /I "..\..\..\libsofia-sip-ua\msg" /I "..\..\..\libsofia-sip-ua\sip" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -70,7 +70,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /WX /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /WX /Gm /GX /ZI /Od /I ".." /I "..\.." /I "..\..\..\libsofia-sip-ua\su" /I "..\..\..\libsofia-sip-ua\features" /I "..\..\..\libsofia-sip-ua\tport" /I "..\..\..\libsofia-sip-ua\iptsec" /I "..\..\..\libsofia-sip-ua\ipt" /I "..\..\..\libsofia-sip-ua\url" /I "..\..\..\libsofia-sip-ua\nta" /I "..\..\..\libsofia-sip-ua\msg" /I "..\..\..\libsofia-sip-ua\sip" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /WX /Gm /GX /ZI /Od /I ".." /I "..\.." /I "..\..\..\libsofia-sip-ua\su" /I "..\..\..\libsofia-sip-ua\features" /I "..\..\..\libsofia-sip-ua\tport" /I "..\..\..\libsofia-sip-ua\iptsec" /I "..\..\..\libsofia-sip-ua\ipt" /I "..\..\..\libsofia-sip-ua\url" /I "..\..\..\libsofia-sip-ua\nta" /I "..\..\..\libsofia-sip-ua\stun" /I "..\..\..\libsofia-sip-ua\msg" /I "..\..\..\libsofia-sip-ua\sip" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 Modified: freeswitch/trunk/libs/sofia-sip/win32/utils/stunc/stunc.vcproj ============================================================================== --- freeswitch/trunk/libs/sofia-sip/win32/utils/stunc/stunc.vcproj (original) +++ freeswitch/trunk/libs/sofia-sip/win32/utils/stunc/stunc.vcproj Mon Nov 12 11:04:47 2007 @@ -147,7 +147,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..,..\..,..\..\..\libsofia-sip-ua\su,..\..\..\libsofia-sip-ua\features,..\..\..\libsofia-sip-ua\tport,..\..\..\libsofia-sip-ua\iptsec,..\..\..\libsofia-sip-ua\ipt,..\..\..\libsofia-sip-ua\url,..\..\..\libsofia-sip-ua\nta,..\..\..\libsofia-sip-ua\msg,..\..\..\libsofia-sip-ua\sip" + AdditionalIncludeDirectories="..;..\..;"..\..\..\libsofia-sip-ua\su";"..\..\..\libsofia-sip-ua\features";"..\..\..\libsofia-sip-ua\tport";"..\..\..\libsofia-sip-ua\iptsec";"..\..\..\libsofia-sip-ua\ipt";"..\..\..\libsofia-sip-ua\url";"..\..\..\libsofia-sip-ua\nta";"..\..\..\libsofia-sip-ua\msg";"..\..\..\libsofia-sip-ua\sip";"..\..\..\libsofia-sip-ua\stun"" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" StringPooling="true" RuntimeLibrary="2"