[Freeswitch-trunk] [commit] r12420 - in freeswitch/trunk/libs/sofia-sip: . s2check

[FreeSWITCH SVN]

Author: mikej
Date: Wed Mar  4 14:39:24 2009
New Revision: 12420

Log:
Wed Mar  4 12:29:06 CST 2009  Pekka Pessi <first.last at nokia.com>
  * s2sip: removed nua dependency
  Ignore-this: d32f68be34d4628129aff2afad3c99f1
  
  Fixed CK_FORK=no case.



Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/s2check/s2sip.c
   freeswitch/trunk/libs/sofia-sip/s2check/s2sip.h

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Wed Mar  4 14:39:24 2009
@@ -1 +1 @@
-Wed Mar  4 14:37:34 CST 2009
+Wed Mar  4 14:38:54 CST 2009

Modified: freeswitch/trunk/libs/sofia-sip/s2check/s2sip.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/s2check/s2sip.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/s2check/s2sip.c	Wed Mar  4 14:39:24 2009
@@ -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 @@
 
 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 @@
  */
 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 @@
   if (s2sip) {
     tport_destroy(s2sip->master), s2sip->master = NULL;
     su_root_destroy(s2sip->root), s2sip->root = NULL;
+    su_home_unref(s2sip->home);
+    s2sip = NULL;
   }
 }

Modified: freeswitch/trunk/libs/sofia-sip/s2check/s2sip.h
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/s2check/s2sip.h	(original)
+++ freeswitch/trunk/libs/sofia-sip/s2check/s2sip.h	Wed Mar  4 14:39:24 2009
@@ -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"