[Pkg-voip-commits] r10130 - in /asterisk/trunk/debian/patches: AST-2013-003 bluetooth_bind
tzafrir at alioth.debian.org
tzafrir at alioth.debian.org
Sat Apr 6 11:15:38 UTC 2013
Author: tzafrir
Date: Sat Apr 6 11:15:37 2013
New Revision: 10130
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10130
Log:
'quilt refresh' the new patches
Modified:
asterisk/trunk/debian/patches/AST-2013-003
asterisk/trunk/debian/patches/bluetooth_bind
Modified: asterisk/trunk/debian/patches/AST-2013-003
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/AST-2013-003?rev=10130&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/AST-2013-003 (original)
+++ asterisk/trunk/debian/patches/AST-2013-003 Sat Apr 6 11:15:37 2013
@@ -36,8 +36,6 @@
channels/sip/include/sip.h | 1 -
2 files changed, 83 insertions(+), 46 deletions(-)
-diff --git a/channels/chan_sip.c b/channels/chan_sip.c
-index afa25ae..41dbfc2 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -1110,6 +1110,11 @@ static struct ao2_container *threadt;
@@ -52,7 +50,7 @@
/*! \brief The register list: Other SIP proxies we register with and receive calls from */
static struct ast_register_list {
ASTOBJ_CONTAINER_COMPONENTS(struct sip_registry);
-@@ -1250,7 +1255,7 @@ static int transmit_response_with_unsupported(struct sip_pvt *p, const char *msg
+@@ -1250,7 +1255,7 @@ static int transmit_response_with_unsupp
static int transmit_response_with_auth(struct sip_pvt *p, const char *msg, const struct sip_request *req, const char *rand, enum xmittype reliable, const char *header, int stale);
static int transmit_provisional_response(struct sip_pvt *p, const char *msg, const struct sip_request *req, int with_sdp);
static int transmit_response_with_allow(struct sip_pvt *p, const char *msg, const struct sip_request *req, enum xmittype reliable);
@@ -61,7 +59,7 @@
static int transmit_request(struct sip_pvt *p, int sipmethod, uint32_t seqno, enum xmittype reliable, int newbranch);
static int transmit_request_with_auth(struct sip_pvt *p, int sipmethod, uint32_t seqno, enum xmittype reliable, int newbranch);
static int transmit_publish(struct sip_epa_entry *epa_entry, enum sip_publish_type publish_type, const char * const explicit_uri);
-@@ -14856,6 +14861,7 @@ static enum check_auth_result check_auth(struct sip_pvt *p, struct sip_request *
+@@ -14621,6 +14626,7 @@ static enum check_auth_result check_auth
char a1_hash[256];
char resp_hash[256]="";
char *c;
@@ -69,7 +67,7 @@
int wrongnonce = FALSE;
int good_response;
const char *usednonce = p->randdata;
-@@ -14950,8 +14956,14 @@ static enum check_auth_result check_auth(struct sip_pvt *p, struct sip_request *
+@@ -14715,8 +14721,14 @@ static enum check_auth_result check_auth
}
}
@@ -85,7 +83,7 @@
ast_log(LOG_WARNING, "username mismatch, have <%s>, digest has <%s>\n",
username, keys[K_USER].s);
/* Oops, we're trying something here */
-@@ -14990,7 +15002,8 @@ static enum check_auth_result check_auth(struct sip_pvt *p, struct sip_request *
+@@ -14755,7 +14767,8 @@ static enum check_auth_result check_auth
}
good_response = keys[K_RESP].s &&
@@ -95,7 +93,7 @@
if (wrongnonce) {
if (good_response) {
if (sipdebug)
-@@ -15134,7 +15147,7 @@ static int cb_extensionstate(char *context, char* exten, int state, void *data)
+@@ -14899,7 +14912,7 @@ static int cb_extensionstate(char *conte
/*! \brief Send a fake 401 Unauthorized response when the administrator
wants to hide the names of local devices from fishers
*/
@@ -104,7 +102,7 @@
{
/* We have to emulate EXACTLY what we'd get with a good peer
* and a bad password, or else we leak information. */
-@@ -15173,13 +15186,13 @@ static void transmit_fake_auth_response(struct sip_pvt *p, int sipmethod, struct
+@@ -14938,13 +14951,13 @@ static void transmit_fake_auth_response(
}
if (!(buf = ast_str_thread_get(&check_auth_buf, CHECK_AUTH_BUF_INITLEN))) {
@@ -120,7 +118,7 @@
return;
}
-@@ -15217,7 +15230,7 @@ static void transmit_fake_auth_response(struct sip_pvt *p, int sipmethod, struct
+@@ -14982,7 +14995,7 @@ static void transmit_fake_auth_response(
/* Schedule auto destroy in 32 seconds */
sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
} else {
@@ -129,7 +127,7 @@
}
}
-@@ -15327,7 +15340,7 @@ static enum check_auth_result register_verify(struct sip_pvt *p, struct ast_sock
+@@ -15077,7 +15090,7 @@ static enum check_auth_result register_v
if (!AST_LIST_EMPTY(&domain_list)) {
if (!check_sip_domain(domain, NULL, 0)) {
if (sip_cfg.alwaysauthreject) {
@@ -138,7 +136,7 @@
} else {
transmit_response(p, "404 Not found (unknown domain)", &p->initreq);
}
-@@ -15354,6 +15367,13 @@ static enum check_auth_result register_verify(struct sip_pvt *p, struct ast_sock
+@@ -15104,6 +15117,13 @@ static enum check_auth_result register_v
}
peer = find_peer(name, NULL, TRUE, FINDPEERS, FALSE, 0);
@@ -152,7 +150,7 @@
if (!(peer && ast_apply_ha(peer->ha, addr))) {
/* Peer fails ACL check */
if (peer) {
-@@ -15429,7 +15449,7 @@ static enum check_auth_result register_verify(struct sip_pvt *p, struct ast_sock
+@@ -15183,7 +15203,7 @@ static enum check_auth_result register_v
switch (parse_register_contact(p, peer, req)) {
case PARSE_REGISTER_DENIED:
ast_log(LOG_WARNING, "Registration denied because of contact ACL\n");
@@ -161,7 +159,7 @@
peer->lastmsgssent = -1;
res = 0;
break;
-@@ -15469,7 +15489,7 @@ static enum check_auth_result register_verify(struct sip_pvt *p, struct ast_sock
+@@ -15218,7 +15238,7 @@ static enum check_auth_result register_v
switch (res) {
case AUTH_SECRET_FAILED:
/* Wrong password in authentication. Go away, don't try again until you fixed it */
@@ -170,7 +168,7 @@
if (global_authfailureevents) {
const char *peer_addr = ast_strdupa(ast_sockaddr_stringify_addr(addr));
const char *peer_port = ast_strdupa(ast_sockaddr_stringify_port(addr));
-@@ -15492,7 +15512,7 @@ static enum check_auth_result register_verify(struct sip_pvt *p, struct ast_sock
+@@ -15241,7 +15261,7 @@ static enum check_auth_result register_v
case AUTH_PEER_NOT_DYNAMIC:
case AUTH_ACL_FAILED:
if (sip_cfg.alwaysauthreject) {
@@ -179,7 +177,7 @@
if (global_authfailureevents) {
const char *peer_addr = ast_strdupa(ast_sockaddr_stringify_addr(addr));
const char *peer_port = ast_strdupa(ast_sockaddr_stringify_port(addr));
-@@ -16522,7 +16542,19 @@ static enum check_auth_result check_peer_ok(struct sip_pvt *p, char *of,
+@@ -16242,7 +16262,19 @@ static enum check_auth_result check_peer
ast_verbose("No matching peer for '%s' from '%s'\n",
of, ast_sockaddr_stringify(&p->recv));
}
@@ -200,7 +198,7 @@
}
if (!ast_apply_ha(peer->ha, addr)) {
-@@ -16530,9 +16562,10 @@ static enum check_auth_result check_peer_ok(struct sip_pvt *p, char *of,
+@@ -16250,9 +16282,10 @@ static enum check_auth_result check_peer
unref_peer(peer, "unref_peer: check_peer_ok: from find_peer call, early return of AUTH_ACL_FAILED");
return AUTH_ACL_FAILED;
}
@@ -212,7 +210,7 @@
/* XXX what about p->prefs = peer->prefs; ? */
/* Set Frame packetization */
-@@ -16801,8 +16834,6 @@ static enum check_auth_result check_user_full(struct sip_pvt *p, struct sip_requ
+@@ -16517,8 +16550,6 @@ static enum check_auth_result check_user
} else {
res = AUTH_RTP_FAILED;
}
@@ -221,7 +219,7 @@
} else {
res = AUTH_SECRET_FAILED; /* we don't want any guests, authentication will fail */
}
-@@ -22582,13 +22613,8 @@ static int handle_request_options(struct sip_pvt *p, struct sip_request *req, st
+@@ -22225,13 +22256,8 @@ static int handle_request_options(struct
return 0;
}
if (res < 0) { /* Something failed in authentication */
@@ -237,7 +235,7 @@
sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
return 0;
}
-@@ -23248,13 +23274,8 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int
+@@ -22896,13 +22922,8 @@ static int handle_request_invite(struct
goto request_invite_cleanup;
}
if (res < 0) { /* Something failed in authentication */
@@ -253,7 +251,7 @@
p->invitestate = INV_COMPLETED;
sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
res = 0;
-@@ -25081,18 +25102,13 @@ static int handle_request_publish(struct sip_pvt *p, struct sip_request *req, st
+@@ -24712,18 +24733,13 @@ static int handle_request_publish(struct
return -1;
}
@@ -275,7 +273,7 @@
sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
ast_string_field_set(p, theirtag, NULL);
return 0;
-@@ -25305,19 +25321,14 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req,
+@@ -24938,19 +24954,14 @@ static int handle_request_subscribe(stru
* use if !req->ignore, because then we'll end up sending
* a 200 OK if someone retransmits without sending auth */
if (p->subscribed == NONE || resubscribe) {
@@ -298,7 +296,7 @@
pvt_set_needdestroy(p, "authentication failed");
return 0;
-@@ -30460,6 +30471,7 @@ static int sip_do_reload(enum channelreloadreason reason)
+@@ -29988,6 +29999,7 @@ static int sip_do_reload(enum channelrel
/*! \brief Force reload of module from cli */
static char *sip_reload(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
@@ -306,7 +304,7 @@
switch (cmd) {
case CLI_INIT:
-@@ -30482,6 +30494,18 @@ static char *sip_reload(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a
+@@ -30010,6 +30022,18 @@ static char *sip_reload(struct ast_cli_e
ast_mutex_unlock(&sip_reload_lock);
restart_monitor();
@@ -325,7 +323,7 @@
return CLI_SUCCESS;
}
-@@ -31665,6 +31689,17 @@ static int load_module(void)
+@@ -31130,6 +31154,17 @@ static int load_module(void)
return AST_MODULE_LOAD_DECLINE;
}
@@ -343,7 +341,7 @@
/* Prepare the version that does not require DTMF BEGIN frames.
* We need to use tricks such as memcpy and casts because the variable
* has const fields.
-@@ -31675,6 +31710,7 @@ static int load_module(void)
+@@ -31140,6 +31175,7 @@ static int load_module(void)
/* Make sure we can register our sip channel type */
if (ast_channel_register(&sip_tech)) {
ast_log(LOG_ERROR, "Unable to register channel type 'SIP'\n");
@@ -351,7 +349,7 @@
io_context_destroy(io);
sched_context_destroy(sched);
return AST_MODULE_LOAD_FAILURE;
-@@ -31916,6 +31952,8 @@ static int unload_module(void)
+@@ -31378,6 +31414,8 @@ static int unload_module(void)
ast_debug(2, "TCP/TLS thread container did not become empty :(\n");
}
@@ -360,11 +358,9 @@
ao2_t_ref(peers, -1, "unref the peers table");
ao2_t_ref(peers_by_ip, -1, "unref the peers_by_ip table");
ao2_t_ref(dialogs, -1, "unref the dialogs table");
-diff --git a/channels/sip/include/sip.h b/channels/sip/include/sip.h
-index 6040daa..4d1dc1f 100644
--- a/channels/sip/include/sip.h
+++ b/channels/sip/include/sip.h
-@@ -471,7 +471,6 @@ enum check_auth_result {
+@@ -470,7 +470,6 @@ enum check_auth_result {
AUTH_SECRET_FAILED = -1,
AUTH_USERNAME_MISMATCH = -2,
AUTH_NOT_FOUND = -3, /*!< returned by register_verify */
@@ -372,6 +368,3 @@
AUTH_UNKNOWN_DOMAIN = -5,
AUTH_PEER_NOT_DYNAMIC = -6,
AUTH_ACL_FAILED = -7,
---
-1.7.10.4
-
Modified: asterisk/trunk/debian/patches/bluetooth_bind
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bluetooth_bind?rev=10130&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bluetooth_bind (original)
+++ asterisk/trunk/debian/patches/bluetooth_bind Sat Apr 6 11:15:37 2013
@@ -17,11 +17,9 @@
addons/chan_mobile.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/addons/chan_mobile.c b/addons/chan_mobile.c
-index c4779ea..81f2d2d 100644
--- a/addons/chan_mobile.c
+++ b/addons/chan_mobile.c
-@@ -1371,7 +1371,7 @@ static int rfcomm_connect(bdaddr_t src, bdaddr_t dst, int remote_channel)
+@@ -1370,7 +1370,7 @@ static int rfcomm_connect(bdaddr_t src,
memset(&addr, 0, sizeof(addr));
addr.rc_family = AF_BLUETOOTH;
bacpy(&addr.rc_bdaddr, &src);
@@ -30,6 +28,3 @@
if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
ast_debug(1, "bind() failed (%d).\n", errno);
close(s);
---
-1.7.10.4
-
More information about the Pkg-voip-commits
mailing list