[Asterisk-cvs] asterisk/channels chan_sip.c,1.321,1.322

[markster at lists.digium.com]

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

Modified Files:
	chan_sip.c 
Log Message:
Leave retry time alone, handle "opaque" stuff in message.


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -d -r1.321 -r1.322
--- chan_sip.c	29 Mar 2004 08:20:35 -0000	1.321
+++ chan_sip.c	31 Mar 2004 08:00:26 -0000	1.322
@@ -254,6 +254,7 @@
 	char our_contact[256];				/* Our contact header */
 	char realm[256];				/* Authorization realm */
 	char nonce[256];				/* Authorization nonce */
+	char opaque[256];				/* Opaque nonsense */
 	char domain[256];				/* Authorization nonce */
 	char lastmsg[256];				/* Last Message sent/received */
 	int amaflags;						/* AMA Flags */
@@ -4720,6 +4721,7 @@
 	char *realm = "";
 	char *nonce = "";
 	char *domain = "";
+	char *opaque = "";
 	char *c;
 
 
@@ -4754,6 +4756,17 @@
 				if ((c = strchr(c,',')))
 					*c = '\0';
 			}
+		} else if (!strncasecmp(c, "opaque=", strlen("opaque="))) {
+			c+=strlen("opaque=");
+			if ((*c == '\"')) {
+				opaque=++c;
+				if ((c = strchr(c,'\"')))
+					*c = '\0';
+			} else {
+				opaque = c;
+				if ((c = strchr(c,',')))
+					*c = '\0';
+			}
 		} else if (!strncasecmp(c, "domain=", strlen("domain="))) {
 			c+=strlen("domain=");
 			if ((*c == '\"')) {
@@ -4777,6 +4790,7 @@
 	strncpy(p->realm, realm, sizeof(p->realm)-1);
 	strncpy(p->nonce, nonce, sizeof(p->nonce)-1);
 	strncpy(p->domain, domain, sizeof(p->domain)-1);
+	strncpy(p->opaque, opaque, sizeof(p->opaque)-1);
 	build_reply_digest(p, orig_header, digest, digest_len); 
 	return 0;
 }
@@ -4808,7 +4822,7 @@
 	snprintf(resp,sizeof(resp),"%s:%s:%s",a1_hash,p->nonce,a2_hash);
 	md5_hash(resp_hash,resp);
 
-	snprintf(digest,digest_len,"Digest username=\"%s\", realm=\"%s\", algorithm=\"MD5\", uri=\"%s\", nonce=\"%s\", response=\"%s\"",p->peername,p->realm,uri,p->nonce,resp_hash);
+	snprintf(digest,digest_len,"Digest username=\"%s\", realm=\"%s\", algorithm=\"MD5\", uri=\"%s\", nonce=\"%s\", response=\"%s\", opaque=\"%s\"",p->peername,p->realm,uri,p->nonce,resp_hash, p->opaque);
 
 	return 0;
 }