[asterisk-commits] kpfleming: branch kpfleming/issue_8855 r133906 - /team/kpfleming/issue_8855/c...

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Fri Jul 25 17:15:41 2008
New Revision: 133906

URL: http://svn.digium.com/view/asterisk?view=rev&rev=133906
Log:
begin the breakage

Modified:
    team/kpfleming/issue_8855/channels/chan_sip.c

Modified: team/kpfleming/issue_8855/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/issue_8855/channels/chan_sip.c?view=diff&rev=133906&r1=133905&r2=133906
==============================================================================
--- team/kpfleming/issue_8855/channels/chan_sip.c (original)
+++ team/kpfleming/issue_8855/channels/chan_sip.c Fri Jul 25 17:15:41 2008
@@ -991,12 +991,9 @@
 #define SIP_DTMF_AUTO		(3 << 15)	/*!< DP: DTMF Support: AUTO switch between rfc2833 and in-band DTMF */
 #define SIP_DTMF_SHORTINFO      (4 << 15)       /*!< DP: DTMF Support: SIP Info messages - "info" - short variant */
 
-/* NAT settings - see nat2str() */
-#define SIP_NAT			(3 << 18)	/*!< DP: four settings, uses two bits */
-#define SIP_NAT_NEVER		(0 << 18)	/*!< DP: No nat support */
-#define SIP_NAT_RFC3581		(1 << 18)	/*!< DP: NAT RFC3581 */
-#define SIP_NAT_ROUTE		(2 << 18)	/*!< DP: NAT Only ROUTE */
-#define SIP_NAT_ALWAYS		(3 << 18)	/*!< DP: NAT Both ROUTE and RFC3581 */
+#define SIP_NAT_RFC3581		(1 << 18)	/*!< DP: force RFC3581 mode, even if not requested by peer */
+
+#define SIP_NAT_MEDIA		(1 << 19)	/*!< DP: use symmetric (Comedia) mode for media streams */
 
 /* re-INVITE related settings */
 #define SIP_REINVITE		(7 << 20)	/*!< DP: four settings, uses three bits */
@@ -1009,7 +1006,7 @@
 #define SIP_INSECURE		(3 << 23)	/*!< DP: three settings, uses two bits */
 #define SIP_INSECURE_NONE	(0 << 23)	/*!< DP: secure mode */
 #define SIP_INSECURE_PORT	(1 << 23)	/*!< DP: don't require matching port for incoming requests */
-#define SIP_INSECURE_INVITE	(1 << 24)	/*!< DP: don't require authentication for incoming INVITEs */
+#define SIP_INSECURE_INVITE	(2 << 23)	/*!< DP: don't require authentication for incoming INVITEs */
 
 /* Sending PROGRESS in-band settings */
 #define SIP_PROG_INBAND		(3 << 25)	/*!< DP: three settings, uses two bits */
@@ -1017,13 +1014,15 @@
 #define SIP_PROG_INBAND_NO	(1 << 25)
 #define SIP_PROG_INBAND_YES	(2 << 25)
 
+#define SIP_NAT_RFC3581_AUTO	(1 << 27)	/*!< D: RFC3581 support was requested by peer */
+
 #define SIP_SENDRPID		(1 << 29)	/*!< DP: Remote Party-ID Support */
 #define SIP_G726_NONSTANDARD	(1 << 31)	/*!< DP: Use non-standard packing for G726-32 data */
 
 /*! \brief Flags to copy from peer/user to dialog */
 #define SIP_FLAGS_TO_COPY \
 	(SIP_PROMISCREDIR | SIP_TRUSTRPID | SIP_SENDRPID | SIP_DTMF | SIP_REINVITE | \
-	 SIP_PROG_INBAND | SIP_USECLIENTCODE | SIP_NAT | SIP_G726_NONSTANDARD | \
+	 SIP_PROG_INBAND | SIP_USECLIENTCODE | SIP_NAT_RFC3581 | SIP_NAT_MEDIA | SIP_G726_NONSTANDARD | \
 	 SIP_USEREQPHONE | SIP_INSECURE)
 /*@}*/ 
 
@@ -1309,7 +1308,6 @@
 	int maxcallbitrate;			/*!< Maximum Call Bitrate for Video Calls */	
 	struct sip_proxy *outboundproxy;	/*!< Outbound proxy for this dialog */
 	struct t38properties t38;		/*!< T38 settings */
-	struct sockaddr_in udptlredirip;	/*!< Where our T.38 UDPTL should be going if not to us */
 	struct ast_udptl *udptl;		/*!< T.38 UDPTL session */
 	int callingpres;			/*!< Calling presentation */
 	int authtries;				/*!< Times we've tried to authenticate */
@@ -1321,14 +1319,15 @@
 	int sessionversion_remote;		/*!< Remote UA's SDP Session Version */
 	int session_modify;			/*!< Session modification request true/false  */
 	struct sockaddr_in sa;			/*!< Our peer */
+	struct sockaddr_in recv;		/*!< Received as */
+	struct sockaddr_in ourip;		/*!< Our IP (as seen from the outside) */
 	struct sockaddr_in redirip;		/*!< Where our RTP should be going if not to us */
 	struct sockaddr_in vredirip;		/*!< Where our Video RTP should be going if not to us */
 	struct sockaddr_in tredirip;		/*!< Where our Text RTP should be going if not to us */
+	struct sockaddr_in udptlredirip;	/*!< Where our T.38 UDPTL should be going if not to us */
 	time_t lastrtprx;			/*!< Last RTP received */
 	time_t lastrtptx;			/*!< Last RTP sent */
 	int rtptimeout;				/*!< RTP timeout time */
-	struct sockaddr_in recv;		/*!< Received as */
-	struct sockaddr_in ourip;		/*!< Our IP (as seen from the outside) */
 	struct ast_channel *owner;		/*!< Who owns us (if we have an owner) */
 	struct sip_route *route;		/*!< Head of linked list of routing steps (fm Record-Route) */
 	int route_persistant;			/*!< Is this the "real" route? */