Wed Mar 4 12:29:06 CST 2009 Pekka Pessi <first.last@nokia.com>

  * s2sip: removed nua dependency
  Ignore-this: d32f68be34d4628129aff2afad3c99f1

  Fixed CK_FORK=no case.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12420 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 4a8fdf8c05cb135bb4d524abd1069bb3f72bf8ec..929e2b1b033674b88db9bf40164c2879e0cc40ba 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Wed Mar  4 14:37:34 CST 2009
+Wed Mar  4 14:38:54 CST 2009

diff --git a/libs/sofia-sip/s2check/s2sip.c b/libs/sofia-sip/s2check/s2sip.c
index e2d161c5b4e75abca83339d0e8a46b12e0c6e121..57ef2ee3941d34641e8768db4e011959c96ac147 100644 (file)
--- a/libs/sofia-sip/s2check/s2sip.c
+++ b/libs/sofia-sip/s2check/s2sip.c
@@ -44,6 +44,7 @@
 
 #include <sofia-sip/sip_header.h>
 #include <sofia-sip/sip_status.h>
+#include <sofia-sip/sip_tag.h>
 #include <sofia-sip/msg_addr.h>
 #include <sofia-sip/su_log.h>
 #include <sofia-sip/su_tagarg.h>
@@ -269,8 +270,8 @@ s2_sip_save_uas_dialog(struct dialog *d, sip_t *sip)
 
 struct message *
 s2_sip_respond_to(struct message *m, struct dialog *d,
-             int status, char const *phrase,
-             tag_type_t tag, tag_value_t value, ...)
+                 int status, char const *phrase,
+                 tag_type_t tag, tag_value_t value, ...)
 {
   ta_list ta;
   msg_t *reply;
@@ -395,9 +396,9 @@ s2_complete_response(msg_t *response,
  */
 int
 s2_sip_request_to(struct dialog *d,
-             sip_method_t method, char const *name,
-             tport_t *tport,
-             tag_type_t tag, tag_value_t value, ...)
+                 sip_method_t method, char const *name,
+                 tport_t *tport,
+                 tag_type_t tag, tag_value_t value, ...)
 {
   ta_list ta;
   tagi_t const *tags;
@@ -811,5 +812,7 @@ s2_sip_teardown(void)
   if (s2sip) {
     tport_destroy(s2sip->master), s2sip->master = NULL;
     su_root_destroy(s2sip->root), s2sip->root = NULL;
+    su_home_unref(s2sip->home);
+    s2sip = NULL;
   }
 }

diff --git a/libs/sofia-sip/s2check/s2sip.h b/libs/sofia-sip/s2check/s2sip.h
index 956d8460e078f1545fd87764287b31fc31b265e5..3f611212a65d561316b8da0cbc845721d2d691a0 100644 (file)
--- a/libs/sofia-sip/s2check/s2sip.h
+++ b/libs/sofia-sip/s2check/s2sip.h
@@ -27,7 +27,6 @@
 #include <sofia-sip/su_wait.h>
 #include <sofia-sip/sip.h>
 #include <sofia-sip/tport.h>
-#include <sofia-sip/nua.h>
 
 #include "s2util.h"