[Pkg-voip-commits] r8883 - /asterisk/branches/lenny-security/debian/patches/AST-2011-006
tzafrir at alioth.debian.org
tzafrir at alioth.debian.org
Thu Apr 21 21:24:18 UTC 2011
Author: tzafrir
Date: Thu Apr 21 21:24:15 2011
New Revision: 8883
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8883
Log:
Refrehsed patch AST-2011-006
Modified:
asterisk/branches/lenny-security/debian/patches/AST-2011-006
Modified: asterisk/branches/lenny-security/debian/patches/AST-2011-006
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/lenny-security/debian/patches/AST-2011-006?rev=8883&op=diff
==============================================================================
--- asterisk/branches/lenny-security/debian/patches/AST-2011-006 (original)
+++ asterisk/branches/lenny-security/debian/patches/AST-2011-006 Thu Apr 21 21:24:15 2011
@@ -32,8 +32,6 @@
main/manager.c | 18 ++++++++++
5 files changed, 128 insertions(+), 6 deletions(-)
-diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
-index 59e8cfa..f6bce77 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -96,8 +96,13 @@ enum skinny_codecs {
@@ -58,7 +56,7 @@
struct sockaddr_in sin;
int fd;
char inbuf[SKINNY_MAX_PACKET];
-@@ -3064,6 +3070,7 @@ static int handle_register_message(struct skinny_req *req, struct skinnysession
+@@ -3058,6 +3064,7 @@ static int handle_register_message(struc
transmit_response(s, req);
return 0;
}
@@ -66,7 +64,7 @@
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Device '%s' successfully registered\n", name);
-@@ -4427,6 +4434,9 @@ static void destroy_session(struct skinnysession *s)
+@@ -4421,6 +4428,9 @@ static void destroy_session(struct skinn
if (s->fd > -1) {
close(s->fd);
}
@@ -76,7 +74,7 @@
ast_mutex_destroy(&s->lock);
free(s);
} else {
-@@ -4439,12 +4449,29 @@ static int get_input(struct skinnysession *s)
+@@ -4433,12 +4443,29 @@ static int get_input(struct skinnysessio
{
int res;
int dlen = 0;
@@ -107,7 +105,7 @@
/* we add 10% to the keep_alive to deal */
/* with network delays, etc */
if (res < 0) {
-@@ -4454,8 +4481,13 @@ static int get_input(struct skinnysession *s)
+@@ -4447,8 +4474,13 @@ static int get_input(struct skinnysessio
return res;
}
} else if (res == 0) {
@@ -123,7 +121,7 @@
skinny_unregister(NULL, s);
return -1;
}
-@@ -4594,18 +4626,35 @@ static void *accept_thread(void *ignore)
+@@ -4584,18 +4616,35 @@ static void *accept_thread(void *ignore)
ast_log(LOG_NOTICE, "Accept returned -1: %s\n", strerror(errno));
continue;
}
@@ -160,7 +158,7 @@
ast_mutex_lock(&sessionlock);
s->next = sessions;
sessions = s;
-@@ -4756,6 +4805,24 @@ static int reload_config(void)
+@@ -4746,6 +4795,24 @@ static int reload_config(void)
}
} else if (!strcasecmp(v->name, "keepalive")) {
keep_alive = atoi(v->value);
@@ -185,8 +183,6 @@
} else if (!strcasecmp(v->name, "dateformat")) {
memcpy(date_format, v->value, sizeof(date_format));
} else if (!strcasecmp(v->name, "allow")) {
-diff --git a/configs/http.conf.sample b/configs/http.conf.sample
-index f8a86f8..c05fa94 100644
--- a/configs/http.conf.sample
+++ b/configs/http.conf.sample
@@ -26,7 +26,12 @@ bindport=8088
@@ -203,11 +199,9 @@
; The post_mappings section maps URLs to real paths on the filesystem. If a
; POST is done from within an authenticated manager session to one of the
; configured POST mappings, then any files in the POST will be placed in the
-diff --git a/configs/skinny.conf.sample b/configs/skinny.conf.sample
-index 87c37e4..07e6d5b 100644
--- a/configs/skinny.conf.sample
+++ b/configs/skinny.conf.sample
-@@ -9,6 +9,15 @@ dateformat=M-D-Y ; M,D,Y in any order (6 chars max)
+@@ -9,6 +9,15 @@ dateformat=M-D-Y ; M,D,Y in any order (6
; Use M for month, D for day, Y for year, A for 12-hour time.
keepalive=120
@@ -223,11 +217,9 @@
;allow=all ; see doc/rtp-packetization for framing options
;disallow=
-diff --git a/main/http.c b/main/http.c
-index 213701d..b578289 100644
--- a/main/http.c
+++ b/main/http.c
-@@ -60,6 +60,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+@@ -59,6 +59,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
#define MAX_PREFIX 80
#define DEFAULT_PREFIX "/asterisk"
@@ -235,7 +227,7 @@
struct ast_http_server_instance {
FILE *f;
-@@ -77,6 +78,8 @@ static char prefix[MAX_PREFIX];
+@@ -76,6 +77,8 @@ static char prefix[MAX_PREFIX];
static int prefix_len;
static struct sockaddr_in oldsin;
static int enablestatic;
@@ -244,7 +236,7 @@
/*! \brief Limit the kinds of files we're willing to serve up */
static struct {
-@@ -516,6 +519,7 @@ static void *ast_httpd_helper_thread(void *data)
+@@ -508,6 +511,7 @@ static void *ast_httpd_helper_thread(voi
}
fclose(ser->f);
free(ser);
@@ -252,7 +244,7 @@
return NULL;
}
-@@ -534,15 +538,23 @@ static void *http_root(void *data)
+@@ -526,15 +530,23 @@ static void *http_root(void *data)
ast_wait_for_input(httpfd, -1);
sinlen = sizeof(sin);
fd = accept(httpfd, (struct sockaddr *)&sin, &sinlen);
@@ -276,7 +268,7 @@
continue;
}
flags = fcntl(fd, F_GETFL);
-@@ -557,12 +569,14 @@ static void *http_root(void *data)
+@@ -549,12 +561,14 @@ static void *http_root(void *data)
ast_log(LOG_WARNING, "Unable to launch helper thread: %s\n", strerror(errno));
fclose(ser->f);
free(ser);
@@ -291,7 +283,7 @@
}
}
return NULL;
-@@ -679,8 +693,17 @@ static int __ast_http_load(int reload)
+@@ -671,8 +685,17 @@ static int __ast_http_load(int reload)
} else {
newprefix[0] = '\0';
}
@@ -310,11 +302,9 @@
v = v->next;
}
ast_config_destroy(cfg);
-diff --git a/main/manager.c b/main/manager.c
-index 6d4ab0a..65a47e8 100644
--- a/main/manager.c
+++ b/main/manager.c
-@@ -2017,6 +2017,24 @@ static int action_originate(struct mansession *s, const struct message *m)
+@@ -2003,6 +2003,24 @@ static int action_originate(struct manse
l = NULL;
}
uniqueid = ast_alloc_uniqueid();
@@ -339,6 +329,3 @@
if (ast_true(async)) {
struct fast_originate_helper *fast = ast_calloc(1, sizeof(*fast));
if (!fast) {
---
-1.7.4.1
-
More information about the Pkg-voip-commits
mailing list