From 71e80e5f627080a0694624ee9c32b7600c6d5c79 Mon Sep 17 00:00:00 2001
From: Mark Spencer <markster@digium.com>
Date: Wed, 31 Mar 2004 08:00:26 +0000
Subject: [PATCH] Leave retry time alone, handle "opaque" stuff in message.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2589 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_sip.c | 16 +++++++++++++++-
pbx/pbx_spool.c | 3 ---
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 4bf4642747..d7f79cef23 100755
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -254,6 +254,7 @@ static struct sip_pvt {
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 @@ static int reply_digest(struct sip_pvt *p, struct sip_request *req, char *header
char *realm = "";
char *nonce = "";
char *domain = "";
+ char *opaque = "";
char *c;
@@ -4754,6 +4756,17 @@ static int reply_digest(struct sip_pvt *p, struct sip_request *req, char *header
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 @@ static int reply_digest(struct sip_pvt *p, struct sip_request *req, char *header
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 @@ static int build_reply_digest(struct sip_pvt *p, char* orig_header, char* digest
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;
}
diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c
index d5e2b960ff..27f39c9a3c 100755
--- a/pbx/pbx_spool.c
+++ b/pbx/pbx_spool.c
@@ -182,9 +182,6 @@ static int apply_outgoing(struct outgoing *o, char *fn, FILE *f)
}
}
strncpy(o->fn, fn, sizeof(o->fn) - 1);
- /* Check sanity of times */
- if (o->retrytime < o->waittime + 5)
- o->retrytime = o->waittime + 5;
if (!strlen(o->tech) || !strlen(o->dest) || (!strlen(o->app) && !strlen(o->exten))) {
ast_log(LOG_WARNING, "At least one of app or extension must be specified, along with tech and dest in file %s\n", fn);
return -1;
--
GitLab