[asterisk-commits] rizzo: branch rizzo/astobj2 r76471 - /team/rizzo/astobj2/channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: rizzo
Date: Sun Jul 22 22:11:36 2007
New Revision: 76471

URL: http://svn.digium.com/view/asterisk?view=rev&rev=76471
Log:
more merge from trunk aimed at diff reduction.

Modified:
    team/rizzo/astobj2/channels/chan_sip.c

Modified: team/rizzo/astobj2/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/astobj2/channels/chan_sip.c?view=diff&rev=76471&r1=76470&r2=76471
==============================================================================
--- team/rizzo/astobj2/channels/chan_sip.c (original)
+++ team/rizzo/astobj2/channels/chan_sip.c Sun Jul 22 22:11:36 2007
@@ -344,6 +344,53 @@
 	AUTH_NOT_FOUND = -3,	/* returned by register_verify */
 	AUTH_FAKE_AUTH = -4,
 	AUTH_UNKNOWN_DOMAIN = -5,
+};
+
+/*! \brief States for outbound registrations (with register= lines in sip.conf */
+enum sipregistrystate {
+	REG_STATE_UNREGISTERED = 0,	/*!< We are not registred */
+		/* Initial state. We should have a timeout scheduled for the initial
+		 * (or next) registration transmission, calling sip_reregister
+		 */
+
+	REG_STATE_REGSENT,	/*!< Registration request sent */
+		/* sent initial request, waiting for an ack or a timeout to
+		 * retransmit the initial request.
+		 */
+
+	REG_STATE_AUTHSENT,	/*!< We have tried to authenticate */
+		/* entered after transmit_register with auth info,
+		 * waiting for an ack.
+		 */
+
+	REG_STATE_REGISTERED,	/*!< Registered and done */
+	REG_STATE_REJECTED,	/*!< Registration rejected */
+		/* only used when the remote party has an expire larger than
+		 * our max-expire. This is a final state from which we do not
+		 * recover (not sure how correctly).
+		 */
+	REG_STATE_TIMEOUT,	/*!< Registration timed out */
+		/* XXX unused */
+
+	REG_STATE_NOAUTH,	/*!< We have no accepted credentials */
+		/* fatal - no chance to proceed */
+
+	REG_STATE_FAILED,	/*!< Registration failed after several tries */
+		/* fatal - no chance to proceed */
+};
+
+/*! \brief definition of a sip proxy server
+ *
+ * For outbound proxies, this is allocated in the SIP peer dynamically or
+ * statically as the global_outboundproxy. The pointer in a SIP message is just
+ * a pointer and should *not* be de-allocated.
+ */
+struct sip_proxy {
+	char name[MAXHOSTNAMELEN];      /*!< DNS name of domain/host or IP */
+	struct sockaddr_in ip;          /*!< Currently used IP address and port */
+	time_t last_dnsupdate;          /*!< When this was resolved */
+	int force;                      /*!< If it's an outbound proxy, Force use of this outbound proxy for all outbound requests */
+	/* Room for a SRV record chain based on the name */
 };
 
 enum can_create_dialog {
@@ -1262,57 +1309,10 @@
 };
 
 
-/*! \brief States for outbound registrations (with register= lines in sip.conf */
-enum sipregistrystate {
-	REG_STATE_UNREGISTERED = 0,	/*!< We are not registred */
-		/* Initial state. We should have a timeout scheduled for the initial
-		 * (or next) registration transmission, calling sip_reregister
-		 */
-
-	REG_STATE_REGSENT,	/*!< Registration request sent */
-		/* sent initial request, waiting for an ack or a timeout to
-		 * retransmit the initial request.
-		 */
-
-	REG_STATE_AUTHSENT,	/*!< We have tried to authenticate */
-		/* entered after transmit_register with auth info,
-		 * waiting for an ack.
-		 */
-
-	REG_STATE_REGISTERED,	/*!< Registered and done */
-	REG_STATE_REJECTED,	/*!< Registration rejected */
-		/* only used when the remote party has an expire larger than
-		 * our max-expire. This is a final state from which we do not
-		 * recover (not sure how correctly).
-		 */
-	REG_STATE_TIMEOUT,	/*!< Registration timed out */
-		/* XXX unused */
-
-	REG_STATE_NOAUTH,	/*!< We have no accepted credentials */
-		/* fatal - no chance to proceed */
-
-	REG_STATE_FAILED,	/*!< Registration failed after several tries */
-		/* fatal - no chance to proceed */
-};
-
-/*! \brief definition of a sip proxy server
- *
- * For outbound proxies, this is allocated in the SIP peer dynamically or
- * statically as the global_outboundproxy. The pointer in a SIP message is just
- * a pointer and should *not* be de-allocated.
- */
-struct sip_proxy {
-	char name[MAXHOSTNAMELEN];      /*!< DNS name of domain/host or IP */
-	struct sockaddr_in ip;          /*!< Currently used IP address and port */
-	time_t last_dnsupdate;          /*!< When this was resolved */
-	int force;                      /*!< If it's an outbound proxy, Force use of this outbound proxy for all outbound requests */
-	/* Room for a SRV record chain based on the name */
-};
-
-/*!
- * Registrations with other SIP proxies.
+
+/*! \brief Registrations with other SIP proxies.
  * Created by sip_register(), the entry is linked in the 'regl' list,
- * and never deleted.
+ * and never deleted (other than at 'sip reload' or module unload times).
  * The entry always has a pending timeout, either waiting for an ACK to
  * the REGISTER message (in which case we have to retransmit the request),
  * or waiting for the next REGISTER message to be sent (either the initial one,