Revision

14186

Author

mikej

Date

2009-07-09 19:48:06 -0500 (Thu, 09 Jul 2009)

Log Message

Tue Jul  7 19:00:00 CDT 2009  Pekka Pessi <first.last@nokia.com>
  * nua_session.c: made INFO a general-purpose method

Modified Paths

• freeswitch/trunk/libs/sofia-sip/.update
• freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c

Diff

--- freeswitch/trunk/libs/sofia-sip/.update	2009-07-10 00:46:07 UTC (rev 14185)
+++ freeswitch/trunk/libs/sofia-sip/.update	2009-07-10 00:48:06 UTC (rev 14186)
@@ -1 +1 @@
-Thu Jul  9 19:44:05 CDT 2009
+Thu Jul  9 19:46:28 CDT 2009

--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c	2009-07-10 00:46:07 UTC (rev 14185)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c	2009-07-10 00:48:06 UTC (rev 14186)
@@ -275,7 +275,7 @@
     if (cr->cr_status < 200) {
       nua_stack_event(nh->nh_nua, nh,
 		      NULL,
-		      cr->cr_event,
+		      (enum nua_event_e)cr->cr_event,
 		      SIP_481_NO_TRANSACTION,
 		      NULL);
     }
@@ -696,7 +696,6 @@
 
 extern nua_client_methods_t const nua_bye_client_methods;
 extern nua_client_methods_t const nua_cancel_client_methods;
-extern nua_client_methods_t const nua_info_client_methods;
 extern nua_client_methods_t const nua_update_client_methods;
 extern nua_client_methods_t const nua_prack_client_methods;
 
@@ -1029,7 +1028,7 @@
 
   nua_stack_event(nh->nh_nua, nh,
 		  response,
-		  cr->cr_event,
+		  (enum nua_event_e)cr->cr_event,
 		  status, phrase,
 		  tags);
 
@@ -1146,7 +1145,7 @@
 
   ss->ss_reporting = 0;
 
-  signal_call_state_change(nh, ss, status, phrase, next_state);
+  signal_call_state_change(nh, ss, status, phrase, (enum nua_callstate)next_state);
 
   msg_destroy(response);
 
@@ -1847,7 +1846,7 @@
 
   nua_stack_event(nh->nh_nua, nh,
 		  nta_outgoing_getresponse(orq),
-		  cr->cr_event,
+		  (enum nua_event_e)cr->cr_event,
 		  status, phrase,
 		  tags);
 
@@ -1878,7 +1877,7 @@
       }
     }
 
-    signal_call_state_change(nh, ss, status, phrase, next_state);
+    signal_call_state_change(nh, ss, status, phrase, (enum nua_callstate)next_state);
   }
 
   if (acked &&
@@ -3085,12 +3084,12 @@
   0,				/* crm_extra */
   {				/* crm_flags */
     /* create_dialog */ 0,
-    /* in_dialog */ 0,
+    /* in_dialog */ 1,
     /* target refresh */ 0
   },
   NULL,				/* crm_template */
-  NULL,				/* crm_init */
-  NULL,				/* crm_send */
+  NULL,		/* crm_init */
+  NULL,	/* crm_send */
   NULL,				/* crm_check_restart */
   NULL,				/* crm_recv */
   NULL,				/* crm_preliminary */
@@ -3147,7 +3146,7 @@
     nua_i_info,			/* Event */
     {
       0,			/* Do not create dialog */
-      0,			/* In-dialog request */
+      0,			/* Allow outside dialog, too */
       0,			/* Not a target refresh request  */
       0,			/* Do not add Contact */
     },
@@ -3388,7 +3387,7 @@
 
   nua_stack_event(nh->nh_nua, nh,
 		  nta_outgoing_getresponse(orq),
-		  cr->cr_event,
+		  (enum nua_event_e)cr->cr_event,
 		  status, phrase,
 		  tags);
 
@@ -3416,7 +3415,7 @@
       }
     }
 
-    signal_call_state_change(nh, ss, status, phrase, next_state);
+    signal_call_state_change(nh, ss, status, phrase, (enum nua_callstate)next_state);
   }
 
   return 1;
@@ -3799,7 +3798,7 @@
 
   nua_stack_event(nh->nh_nua, nh,
 		  nta_outgoing_getresponse(orq),
-		  cr->cr_event,
+		  (enum nua_event_e)cr->cr_event,
 		  status, phrase,
 		  tags);