aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-04-01 06:27:10 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-04-01 06:27:10 +0000
commit5a6b4e23176274652a0462e1e13bfd470da1c439 (patch)
treecb84f80ebad742eb87660e7118e5b0e2199b2ea8
parentcdb4ef1496b723268f6100feb0f98ee0e7c26b64 (diff)
Expand SIP opaque buffers, prefer recursive to "error checking" mutexes...
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2596 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-xchannels/chan_sip.c6
-rwxr-xr-xinclude/asterisk/lock.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index d7f79cef2..a3f6e0ec6 100755
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -4694,7 +4694,7 @@ static int sip_no_debug(int fd, int argc, char *argv[])
static int reply_digest(struct sip_pvt *p, struct sip_request *req, char *header, char *respheader, char *digest, int digest_len);
static int do_register_auth(struct sip_pvt *p, struct sip_request *req, char *header, char *respheader) {
- char digest[256];
+ char digest[1024];
p->authtries++;
memset(digest,0,sizeof(digest));
if (reply_digest(p,req, header, "REGISTER", digest, sizeof(digest))) {
@@ -4705,7 +4705,7 @@ static int do_register_auth(struct sip_pvt *p, struct sip_request *req, char *he
}
static int do_proxy_auth(struct sip_pvt *p, struct sip_request *req, char *header, char *respheader, char *msg, int init) {
- char digest[256];
+ char digest[1024];
p->authtries++;
memset(digest,0,sizeof(digest));
if (reply_digest(p,req, "Proxy-Authenticate", msg, digest, sizeof(digest) )) {
@@ -4717,7 +4717,7 @@ static int do_proxy_auth(struct sip_pvt *p, struct sip_request *req, char *heade
static int reply_digest(struct sip_pvt *p, struct sip_request *req, char *header, char *orig_header, char *digest, int digest_len) {
- char tmp[256] = "";
+ char tmp[512] = "";
char *realm = "";
char *nonce = "";
char *domain = "";
diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h
index 49636759c..aba263c09 100755
--- a/include/asterisk/lock.h
+++ b/include/asterisk/lock.h
@@ -32,12 +32,12 @@
// #define AST_MUTEX_INITIALIZER PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
// #define AST_MUTEX_KIND PTHREAD_MUTEX_RECURSIVE_NP
-#ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
-#define AST_MUTEX_INITIALIZER { PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP, NULL, 0, NULL, 0 }
-#else
#ifdef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
#define AST_MUTEX_INITIALIZER { PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP, NULL, 0, NULL, 0 }
#else
+#ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
+#define AST_MUTEX_INITIALIZER { PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP, NULL, 0, NULL, 0 }
+#else
#define AST_MUTEX_INITIALIZER { PTHREAD_MUTEX_INITIALIZER, NULL, 0, NULL, 0 }
#endif
#endif