[Asterisk-cvs] asterisk/channels chan_sip.c,1.676,1.677

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv1584/channels

Modified Files:
	chan_sip.c 
Log Message:
Reorganize SIP code to make more readable (bug #3781)


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.676
retrieving revision 1.677
diff -u -d -r1.676 -r1.677
--- chan_sip.c	17 Mar 2005 22:58:44 -0000	1.676
+++ chan_sip.c	17 Mar 2005 23:03:07 -0000	1.677
@@ -114,6 +114,45 @@
 static const char config[] = "sip.conf";
 static const char notify_config[] = "sip_notify.conf";
 
+#define SIP_REGISTER	1
+#define SIP_OPTIONS	2
+#define SIP_NOTIFY	3
+#define SIP_INVITE	4
+#define SIP_ACK		5
+#define SIP_PRACK	6
+#define SIP_BYE		7
+#define SIP_REFER	8
[...2196 lines suppressed...]
 			ast_set_flag(p, SIP_NEEDDESTROY);	
+		break;
 	}
-	return 0;
+	return res;
 }
 
 /*--- sipsock_read: Read data from SIP socket ---*/
@@ -8891,9 +9066,9 @@
 	ast_set_flag(p, SIP_OUTGOING);
 #ifdef VOCAL_DATA_HACK
 	strncpy(p->username, "__VOCAL_DATA_SHOULD_READ_THE_SIP_SPEC__", sizeof(p->username) - 1);
-	transmit_invite(p, "INVITE", 0, NULL, NULL, NULL,NULL,NULL, 0, 1);
+	transmit_invite(p, SIP_INVITE, 0, NULL, NULL, NULL,NULL,NULL, 0, 1);
 #else
-	transmit_invite(p, "OPTIONS", 0, NULL, NULL, NULL,NULL,NULL, 0, 1);
+	transmit_invite(p, SIP_OPTIONS, 0, NULL, NULL, NULL,NULL,NULL, 0, 1);
 #endif
 	gettimeofday(&peer->ps, NULL);
 	peer->pokeexpire = ast_sched_add(sched, DEFAULT_MAXMS * 2, sip_poke_noanswer, peer);