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
This commit is contained in:
Michael Jerris 2009-03-04 20:39:24 +00:00
parent 980957e967
commit f7d903c8fb
3 changed files with 9 additions and 7 deletions

View File

@ -1 +1 @@
Wed Mar 4 14:37:34 CST 2009 Wed Mar 4 14:38:54 CST 2009

View File

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

View File

@ -27,7 +27,6 @@
#include <sofia-sip/su_wait.h> #include <sofia-sip/su_wait.h>
#include <sofia-sip/sip.h> #include <sofia-sip/sip.h>
#include <sofia-sip/tport.h> #include <sofia-sip/tport.h>
#include <sofia-sip/nua.h>
#include "s2util.h" #include "s2util.h"