[Pkg-voip-commits] [asterisk] 02/11: Refresh patches
tzafrir at debian.org
tzafrir at debian.org
Mon Sep 30 19:35:02 UTC 2013
This is an automated email from the git hooks/post-receive script.
tzafrir pushed a commit to branch master
in repository asterisk.
commit 6792ef5ed06c85800d98d676e60029d8d76df6fa
Author: Tzafrir Cohen <tzafrir at debian.org>
Date: Mon Sep 30 16:41:08 2013 +0300
Refresh patches
---
debian/patches/allow-tilde-destdir | 2 +-
debian/patches/bzero | 9 +----
debian/patches/dahdi_create_channels | 59 ++++++++++++++-----------------
debian/patches/dahdi_pri_event_removed | 13 +++----
debian/patches/pjproject | 60 ++++++++++++++++----------------
debian/patches/safe_asterisk-config | 4 +--
debian/patches/safe_asterisk-nobg | 4 +--
7 files changed, 67 insertions(+), 84 deletions(-)
diff --git a/debian/patches/allow-tilde-destdir b/debian/patches/allow-tilde-destdir
index eccd1fc..da5d2fb 100644
--- a/debian/patches/allow-tilde-destdir
+++ b/debian/patches/allow-tilde-destdir
@@ -14,7 +14,7 @@ which should catch most cases.
--- a/Makefile
+++ b/Makefile
-@@ -608,7 +608,7 @@ oldmodcheck:
+@@ -596,7 +596,7 @@ oldmodcheck:
fi
badshell:
diff --git a/debian/patches/bzero b/debian/patches/bzero
index 480275e..a259148 100644
--- a/debian/patches/bzero
+++ b/debian/patches/bzero
@@ -16,8 +16,6 @@ Origin: http://svnview.digium.com/svn/asterisk?view=rev&rev=382292
res/res_rtp_asterisk.c | 4 ----
2 files changed, 15 deletions(-)
-diff --git a/include/asterisk.h b/include/asterisk.h
-index a25f291..e99bdee 100644
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -213,17 +213,6 @@ struct ast_variable;
@@ -38,11 +36,9 @@ index a25f291..e99bdee 100644
/* Some handy macros for turning a preprocessor token into (effectively) a quoted string */
#define __stringify_1(x) #x
#define __stringify(x) __stringify_1(x)
-diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c
-index 4450a51..05ebf0a 100644
--- a/res/res_rtp_asterisk.c
+++ b/res/res_rtp_asterisk.c
-@@ -46,10 +46,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+@@ -47,10 +47,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
#include <openssl/bio.h>
#endif
@@ -53,6 +49,3 @@ index 4450a51..05ebf0a 100644
#include "pjlib.h"
#include "pjlib-util.h"
#include "pjnath.h"
---
-1.7.10.4
-
diff --git a/debian/patches/dahdi_create_channels b/debian/patches/dahdi_create_channels
index 6209a09..6cc30bf 100644
--- a/debian/patches/dahdi_create_channels
+++ b/debian/patches/dahdi_create_channels
@@ -26,11 +26,9 @@ A trivial backport from trunk / 12.
channels/chan_dahdi.c | 322 +++++++++++++++++++++++++++++++++++++++----------
1 file changed, 261 insertions(+), 61 deletions(-)
-diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
-index 8ce700c..b694ecf 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
-@@ -461,6 +461,8 @@ static const char config[] = "chan_dahdi.conf";
+@@ -404,6 +404,8 @@ static const char config[] = "chan_dahdi
static int num_cadence = 4;
static int user_has_defined_cadences = 0;
@@ -39,7 +37,7 @@ index 8ce700c..b694ecf 100644
static struct dahdi_ring_cadence cadences[NUM_CADENCE_MAX] = {
{ { 125, 125, 2000, 4000 } }, /*!< Quick chirp followed by normal ring */
{ { 250, 250, 500, 1000, 250, 250, 500, 4000 } }, /*!< British style ring */
-@@ -817,6 +819,18 @@ struct dahdi_chan_conf {
+@@ -1391,6 +1393,18 @@ struct dahdi_chan_conf {
* \note Set from the "smdiport" string read in from chan_dahdi.conf
*/
char smdi_port[SMDI_MAX_FILENAME_LEN];
@@ -58,7 +56,7 @@ index 8ce700c..b694ecf 100644
};
/*! returns a new dahdi_chan_conf with default values (by-value) */
-@@ -2633,7 +2647,7 @@ static int sig_pri_tone_to_dahditone(enum sig_pri_tone tone)
+@@ -3217,7 +3231,7 @@ static int sig_pri_tone_to_dahditone(enu
#endif /* defined(HAVE_PRI) */
#if defined(HAVE_PRI)
@@ -67,7 +65,7 @@ index 8ce700c..b694ecf 100644
static void my_handle_dchan_exception(struct sig_pri_span *pri, int index)
{
-@@ -2663,7 +2677,7 @@ static void my_handle_dchan_exception(struct sig_pri_span *pri, int index)
+@@ -3247,7 +3261,7 @@ static void my_handle_dchan_exception(st
pri_event_noalarm(pri, index, 0);
break;
case DAHDI_EVENT_REMOVED:
@@ -76,7 +74,7 @@ index 8ce700c..b694ecf 100644
break;
default:
break;
-@@ -10736,29 +10750,121 @@ static int mwi_send_process_event(struct dahdi_pvt * pvt, int event)
+@@ -11670,29 +11684,121 @@ static int mwi_send_process_event(struct
return handled;
}
@@ -205,7 +203,7 @@ index 8ce700c..b694ecf 100644
static struct dahdi_pvt *handle_init_event(struct dahdi_pvt *i, int event)
{
int res;
-@@ -11124,11 +11230,7 @@ static void *do_monitor(void *data)
+@@ -12058,11 +12164,7 @@ static void *do_monitor(void *data)
doomed = NULL;
for (i = iflist;; i = i->next) {
if (doomed) {
@@ -218,7 +216,7 @@ index 8ce700c..b694ecf 100644
doomed = NULL;
}
if (!i) {
-@@ -13574,10 +13676,21 @@ static int prepare_pri(struct dahdi_pri *pri)
+@@ -14497,10 +14599,21 @@ static int prepare_pri(struct dahdi_pri
for (i = 0; i < SIG_PRI_NUM_DCHANS; i++) {
if (!pri->dchannels[i])
break;
@@ -242,7 +240,7 @@ index 8ce700c..b694ecf 100644
return -1;
}
memset(&p, 0, sizeof(p));
-@@ -13978,22 +14091,44 @@ static char *handle_pri_show_spans(struct ast_cli_entry *e, int cmd, struct ast_
+@@ -14901,22 +15014,44 @@ static char *handle_pri_show_spans(struc
*
* \param pri the pri span
*
@@ -277,9 +275,7 @@ index 8ce700c..b694ecf 100644
+ channel = pvt->channel;
+ ast_debug(2, "About to destroy B-channel %d.\n", channel);
+ dahdi_destroy_channel_range(channel, channel);
- }
-- pthread_cancel(pri->master);
-- pthread_join(pri->master, NULL);
++ }
+
+ cancel_code = pthread_cancel(master);
+ ast_debug(4,
@@ -289,12 +285,14 @@ index 8ce700c..b694ecf 100644
+ res = pthread_join(master, NULL);
+ if (res != 0) {
+ ast_log(LOG_NOTICE, "pthread_join failed: %d\n", res);
-+ }
+ }
+- pthread_cancel(pri->master);
+- pthread_join(pri->master, NULL);
+ pri->master = AST_PTHREADT_NULL;
/* The 'struct dahdi_pri' that contains our 'struct sig_pri_span' */
dahdi_pri = container_of(pri, struct dahdi_pri, pri);
-@@ -14001,17 +14136,16 @@ static int pri_destroy_dchan(struct sig_pri_span *pri)
+@@ -14924,17 +15059,16 @@ static int pri_destroy_dchan(struct sig_
ast_debug(4, "closing pri_fd %d\n", i);
dahdi_close_pri_fd(dahdi_pri, i);
}
@@ -314,7 +312,7 @@ index 8ce700c..b694ecf 100644
switch (cmd) {
case CLI_INIT:
-@@ -14035,25 +14169,13 @@ static char *handle_pri_destroy_span(struct ast_cli_entry *e, int cmd,
+@@ -14958,25 +15092,13 @@ static char *handle_pri_destroy_span(str
a->argv[3], 1, NUM_SPANS);
return CLI_SUCCESS;
}
@@ -343,7 +341,7 @@ index 8ce700c..b694ecf 100644
return CLI_SUCCESS;
}
-@@ -14505,26 +14627,97 @@ static struct ast_cli_entry dahdi_mfcr2_cli[] = {
+@@ -15428,26 +15550,97 @@ static struct ast_cli_entry dahdi_mfcr2_
#endif /* HAVE_OPENR2 */
@@ -450,7 +448,7 @@ index 8ce700c..b694ecf 100644
}
static void dahdi_softhangup_all(void)
-@@ -14555,7 +14748,6 @@ retry:
+@@ -15478,7 +15671,6 @@ retry:
ast_mutex_unlock(&iflock);
}
@@ -458,7 +456,7 @@ index 8ce700c..b694ecf 100644
static int dahdi_restart(void)
{
#if defined(HAVE_PRI) || defined(HAVE_SS7)
-@@ -15332,7 +15524,8 @@ static struct ast_cli_entry dahdi_cli[] = {
+@@ -16254,7 +16446,8 @@ static struct ast_cli_entry dahdi_cli[]
AST_CLI_DEFINE(handle_dahdi_show_cadences, "List cadences"),
AST_CLI_DEFINE(dahdi_show_channels, "Show active DAHDI channels"),
AST_CLI_DEFINE(dahdi_show_channel, "Show information on a channel"),
@@ -468,7 +466,7 @@ index 8ce700c..b694ecf 100644
AST_CLI_DEFINE(dahdi_restart_cmd, "Fully restart DAHDI channels"),
AST_CLI_DEFINE(dahdi_show_status, "Show all DAHDI cards status"),
AST_CLI_DEFINE(dahdi_show_version, "Show the DAHDI version in use"),
-@@ -16359,7 +16552,7 @@ static char *parse_spanchan(char *chanstr, char **subdir)
+@@ -17278,7 +17471,7 @@ static char *parse_spanchan(char *chanst
return p;
}
@@ -477,7 +475,7 @@ index 8ce700c..b694ecf 100644
{
char *c, *chan;
char *subdir;
-@@ -16382,8 +16575,6 @@ static int build_channels(struct dahdi_chan_conf *conf, const char *value, int r
+@@ -17301,8 +17494,6 @@ static int build_channels(struct dahdi_c
finish = start;
} else if (!strcasecmp(chan, "pseudo")) {
finish = start = CHAN_PSEUDO;
@@ -486,7 +484,7 @@ index 8ce700c..b694ecf 100644
} else {
ast_log(LOG_ERROR, "Syntax error parsing '%s' at '%s'\n", value, chan);
return -1;
-@@ -16413,6 +16604,12 @@ static int build_channels(struct dahdi_chan_conf *conf, const char *value, int r
+@@ -17332,6 +17523,12 @@ static int build_channels(struct dahdi_c
}
}
}
@@ -499,7 +497,7 @@ index 8ce700c..b694ecf 100644
tmp = mkintf(real_channel, conf, reload);
if (tmp) {
-@@ -16422,6 +16619,9 @@ static int build_channels(struct dahdi_chan_conf *conf, const char *value, int r
+@@ -17341,6 +17538,9 @@ static int build_channels(struct dahdi_c
(reload == 1) ? "reconfigure" : "register", value);
return -1;
}
@@ -509,7 +507,7 @@ index 8ce700c..b694ecf 100644
}
}
-@@ -16608,7 +16808,6 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct
+@@ -17527,7 +17727,6 @@ static int process_dahdi(struct dahdi_ch
{
struct dahdi_pvt *tmp;
int y;
@@ -517,7 +515,7 @@ index 8ce700c..b694ecf 100644
struct ast_variable *dahdichan = NULL;
for (; v; v = v->next) {
-@@ -16621,7 +16820,7 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct
+@@ -17540,7 +17739,7 @@ static int process_dahdi(struct dahdi_ch
ast_log(LOG_WARNING, "Channel '%s' ignored.\n", v->value);
continue;
}
@@ -526,7 +524,7 @@ index 8ce700c..b694ecf 100644
if (confp->ignore_failed_channels) {
ast_log(LOG_WARNING, "Channel '%s' failure ignored: ignore_failed_channels.\n", v->value);
continue;
-@@ -17754,8 +17953,7 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct
+@@ -18673,8 +18872,7 @@ static int process_dahdi(struct dahdi_ch
if (dahdichan) {
/* Process the deferred dahdichan value. */
@@ -536,7 +534,7 @@ index 8ce700c..b694ecf 100644
if (confp->ignore_failed_channels) {
ast_log(LOG_WARNING,
"Dahdichan '%s' failure ignored: ignore_failed_channels.\n",
-@@ -17778,7 +17976,7 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct
+@@ -18697,7 +18895,7 @@ static int process_dahdi(struct dahdi_ch
/*< \todo why check for the pseudo in the per-channel section.
* Any actual use for manual setup of the pseudo channel? */
@@ -545,7 +543,7 @@ index 8ce700c..b694ecf 100644
/* use the default configuration for a channel, so
that any settings from real configured channels
don't "leak" into the pseudo channel config
-@@ -17792,6 +17990,7 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct
+@@ -18711,6 +18909,7 @@ static int process_dahdi(struct dahdi_ch
}
if (tmp) {
ast_verb(3, "Automatically generated pseudo channel\n");
@@ -553,7 +551,7 @@ index 8ce700c..b694ecf 100644
} else {
ast_log(LOG_WARNING, "Unable to register pseudo channel!\n");
}
-@@ -18071,7 +18270,8 @@ static int setup_dahdi_int(int reload, struct dahdi_chan_conf *default_conf, str
+@@ -18990,7 +19189,8 @@ static int setup_dahdi_int(int reload, s
if (reload != 1) {
int x;
for (x = 0; x < NUM_SPANS; x++) {
@@ -563,6 +561,3 @@ index 8ce700c..b694ecf 100644
prepare_pri(pris + x);
if (sig_pri_start_pri(&pris[x].pri)) {
ast_log(LOG_ERROR, "Unable to start D-channel on span %d\n", x + 1);
---
-1.7.10.4
-
diff --git a/debian/patches/dahdi_pri_event_removed b/debian/patches/dahdi_pri_event_removed
index 4b0b2b1..de83a41 100644
--- a/debian/patches/dahdi_pri_event_removed
+++ b/debian/patches/dahdi_pri_event_removed
@@ -26,11 +26,9 @@ Trivial backport from trunk / 12.
channels/chan_dahdi.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 97 insertions(+)
-diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
-index 28fd65f..8f38893 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
-@@ -3371,6 +3371,8 @@ static int sig_pri_tone_to_dahditone(enum sig_pri_tone tone)
+@@ -3217,6 +3217,8 @@ static int sig_pri_tone_to_dahditone(enu
#endif /* defined(HAVE_PRI) */
#if defined(HAVE_PRI)
@@ -39,7 +37,7 @@ index 28fd65f..8f38893 100644
static void my_handle_dchan_exception(struct sig_pri_span *pri, int index)
{
int x;
-@@ -3398,6 +3400,9 @@ static void my_handle_dchan_exception(struct sig_pri_span *pri, int index)
+@@ -3244,6 +3246,9 @@ static void my_handle_dchan_exception(st
case DAHDI_EVENT_NOALARM:
pri_event_noalarm(pri, index, 0);
break;
@@ -49,7 +47,7 @@ index 28fd65f..8f38893 100644
default:
break;
}
-@@ -15059,6 +15064,97 @@ static char *handle_pri_show_spans(struct ast_cli_entry *e, int cmd, struct ast_
+@@ -14887,6 +14892,97 @@ static char *handle_pri_show_spans(struc
#endif /* defined(HAVE_PRI) */
#if defined(HAVE_PRI)
@@ -147,7 +145,7 @@ index 28fd65f..8f38893 100644
static char *handle_pri_show_span(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
int span;
-@@ -15164,6 +15260,7 @@ static struct ast_cli_entry dahdi_pri_cli[] = {
+@@ -14992,6 +15088,7 @@ static struct ast_cli_entry dahdi_pri_cl
AST_CLI_DEFINE(handle_pri_show_channels, "Displays PRI channel information"),
AST_CLI_DEFINE(handle_pri_show_spans, "Displays PRI span information"),
AST_CLI_DEFINE(handle_pri_show_span, "Displays PRI span information"),
@@ -155,6 +153,3 @@ index 28fd65f..8f38893 100644
AST_CLI_DEFINE(handle_pri_show_debug, "Displays current PRI debug settings"),
AST_CLI_DEFINE(handle_pri_set_debug_file, "Sends PRI debug output to the specified file"),
AST_CLI_DEFINE(handle_pri_version, "Displays libpri version"),
---
-1.7.10.4
-
diff --git a/debian/patches/pjproject b/debian/patches/pjproject
index e9d368a..d88068d 100644
--- a/debian/patches/pjproject
+++ b/debian/patches/pjproject
@@ -28,7 +28,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
AST_EXT_LIB_SETUP([POPT], [popt], [popt])
AST_EXT_LIB_SETUP([PORTAUDIO], [PortAudio], [portaudio])
AST_EXT_LIB_SETUP([PRI], [ISDN PRI], [pri])
-@@ -1994,6 +1995,8 @@ if test "${PG_CONFIG}" != No; then
+@@ -1996,6 +1997,8 @@ if test "${PG_CONFIG}" != No; then
fi
fi
@@ -100,7 +100,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
<depend>uuid</depend>
<support_level>core</support_level>
***/
-@@ -46,9 +47,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
+@@ -47,9 +48,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
#include <openssl/bio.h>
#endif
@@ -115,7 +115,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
#include "asterisk/stun.h"
#include "asterisk/pbx.h"
-@@ -129,6 +132,7 @@ static int nochecksums;
+@@ -130,6 +133,7 @@ static int nochecksums;
#endif
static int strictrtp = DEFAULT_STRICT_RTP; /*< Only accept RTP frames from a defined source. If we receive an indication of a changing source, enter learning mode. */
static int learning_min_sequential = DEFAULT_LEARNING_MIN_SEQUENTIAL; /*< Number of sequential RTP frames needed from a single source during learning mode to accept new source. */
@@ -123,7 +123,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
static int icesupport = DEFAULT_ICESUPPORT;
static struct sockaddr_in stunaddr;
static pj_str_t turnaddr;
-@@ -153,6 +157,7 @@ static pj_thread_t *thread;
+@@ -154,6 +158,7 @@ static pj_thread_t *thread;
/*! \brief Notification that the ICE/TURN worker thread should stop */
static int worker_terminate;
@@ -131,7 +131,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
#define FLAG_3389_WARNING (1 << 0)
#define FLAG_NAT_ACTIVE (3 << 1)
-@@ -250,12 +255,14 @@ struct ast_rtp {
+@@ -251,12 +256,14 @@ struct ast_rtp {
struct rtp_red *red;
@@ -148,7 +148,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
unsigned int passthrough:1; /*!< Bit to indicate that the received packet should be passed through */
unsigned int ice_started:1; /*!< Bit to indicate ICE connectivity checks have started */
-@@ -267,6 +274,7 @@ struct ast_rtp {
+@@ -268,6 +275,7 @@ struct ast_rtp {
struct ao2_container *local_candidates; /*!< The local ICE candidates */
struct ao2_container *remote_candidates; /*!< The remote ICE candidates */
@@ -156,7 +156,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
#ifdef HAVE_OPENSSL_SRTP
SSL_CTX *ssl_ctx; /*!< SSL context */
-@@ -394,6 +402,22 @@ static int ast_rtp_activate(struct ast_r
+@@ -395,6 +403,22 @@ static int ast_rtp_activate(struct ast_r
static int __rtp_sendto(struct ast_rtp_instance *instance, void *buf, size_t size, int flags, struct ast_sockaddr *sa, int rtcp, int *ice, int use_srtp);
@@ -179,7 +179,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
/*! \brief Destructor for locally created ICE candidates */
static void ast_rtp_ice_candidate_destroy(void *obj)
{
-@@ -476,19 +500,6 @@ static void pj_thread_register_check(voi
+@@ -477,19 +501,6 @@ static void pj_thread_register_check(voi
return;
}
@@ -199,7 +199,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
static void ast_rtp_ice_start(struct ast_rtp_instance *instance)
{
struct ast_rtp *rtp = ast_rtp_instance_get_data(instance);
-@@ -692,6 +703,7 @@ static struct ast_rtp_engine_ice ast_rtp
+@@ -693,6 +704,7 @@ static struct ast_rtp_engine_ice ast_rtp
.get_local_candidates = ast_rtp_ice_get_local_candidates,
.ice_lite = ast_rtp_ice_lite,
};
@@ -207,7 +207,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
#ifdef HAVE_OPENSSL_SRTP
static void dtls_info_callback(const SSL *ssl, int where, int ret)
-@@ -1019,13 +1031,16 @@ static struct ast_rtp_engine asterisk_rt
+@@ -1020,13 +1032,16 @@ static struct ast_rtp_engine asterisk_rt
.stop = ast_rtp_stop,
.qos = ast_rtp_qos_set,
.sendcng = ast_rtp_sendcng,
@@ -224,7 +224,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
static void rtp_learning_seq_init(struct rtp_learning_info *info, uint16_t seq);
static void ast_rtp_on_ice_complete(pj_ice_sess *ice, pj_status_t status)
-@@ -1195,6 +1210,7 @@ static int ice_worker_thread(void *data)
+@@ -1196,6 +1211,7 @@ static int ice_worker_thread(void *data)
return 0;
}
@@ -232,7 +232,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
static inline int rtp_debug_test_addr(struct ast_sockaddr *addr)
{
-@@ -1449,6 +1465,7 @@ static int __rtp_recvfrom(struct ast_rtp
+@@ -1450,6 +1466,7 @@ static int __rtp_recvfrom(struct ast_rtp
}
#endif
@@ -240,7 +240,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
if (rtp->ice) {
pj_str_t combined = pj_str(ast_sockaddr_stringify(sa));
pj_sockaddr address;
-@@ -1474,6 +1491,7 @@ static int __rtp_recvfrom(struct ast_rtp
+@@ -1475,6 +1492,7 @@ static int __rtp_recvfrom(struct ast_rtp
}
rtp->passthrough = 0;
}
@@ -248,7 +248,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
if ((*in & 0xC0) && res_srtp && srtp && res_srtp->unprotect(srtp, buf, &len, rtcp) < 0) {
return -1;
-@@ -1505,6 +1523,7 @@ static int __rtp_sendto(struct ast_rtp_i
+@@ -1506,6 +1524,7 @@ static int __rtp_sendto(struct ast_rtp_i
return -1;
}
@@ -256,7 +256,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
if (rtp->ice) {
pj_thread_register_check();
-@@ -1513,6 +1532,7 @@ static int __rtp_sendto(struct ast_rtp_i
+@@ -1514,6 +1533,7 @@ static int __rtp_sendto(struct ast_rtp_i
return 0;
}
}
@@ -264,7 +264,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
return ast_sendto(rtcp ? rtp->rtcp->s : rtp->s, temp, len, flags, sa);
}
-@@ -1630,6 +1650,7 @@ static int rtp_learning_rtp_seq_update(s
+@@ -1631,6 +1651,7 @@ static int rtp_learning_rtp_seq_update(s
return (info->packets == 0);
}
@@ -272,7 +272,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
static void rtp_add_candidates_to_ice(struct ast_rtp_instance *instance, struct ast_rtp *rtp, struct ast_sockaddr *addr, int port, int component,
int transport, const pj_turn_sock_cb *turn_cb, pj_turn_sock **turn_sock)
{
-@@ -1694,6 +1715,7 @@ static void rtp_add_candidates_to_ice(st
+@@ -1695,6 +1716,7 @@ static void rtp_add_candidates_to_ice(st
}
}
}
@@ -280,7 +280,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
static int ast_rtp_new(struct ast_rtp_instance *instance,
struct ast_sched_context *sched, struct ast_sockaddr *addr,
-@@ -1701,8 +1723,10 @@ static int ast_rtp_new(struct ast_rtp_in
+@@ -1702,8 +1724,10 @@ static int ast_rtp_new(struct ast_rtp_in
{
struct ast_rtp *rtp = NULL;
int x, startplace;
@@ -291,7 +291,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
/* Create a new RTP structure to hold all of our data */
if (!(rtp = ast_calloc(1, sizeof(*rtp)))) {
-@@ -1760,6 +1784,7 @@ static int ast_rtp_new(struct ast_rtp_in
+@@ -1761,6 +1785,7 @@ static int ast_rtp_new(struct ast_rtp_in
}
}
@@ -299,7 +299,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
pj_thread_register_check();
pj_stun_config_init(&stun_config, &cachingpool.factory, 0, ioqueue, timerheap);
-@@ -1772,13 +1797,14 @@ static int ast_rtp_new(struct ast_rtp_in
+@@ -1773,13 +1798,14 @@ static int ast_rtp_new(struct ast_rtp_in
ast_rtp_instance_set_data(instance, rtp);
/* Create an ICE session for ICE negotiation */
@@ -315,7 +315,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
/* Record any information we may need */
rtp->sched = sched;
-@@ -1821,6 +1847,7 @@ static int ast_rtp_destroy(struct ast_rt
+@@ -1822,6 +1848,7 @@ static int ast_rtp_destroy(struct ast_rt
ast_free(rtp->red);
}
@@ -323,7 +323,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
pj_thread_register_check();
/* Destroy the ICE session if being used */
-@@ -1848,6 +1875,7 @@ static int ast_rtp_destroy(struct ast_rt
+@@ -1849,6 +1876,7 @@ static int ast_rtp_destroy(struct ast_rt
if (rtp->remote_candidates) {
ao2_ref(rtp->remote_candidates, -1);
}
@@ -331,7 +331,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
#ifdef HAVE_OPENSSL_SRTP
/* Destroy the SSL context if present */
-@@ -3872,10 +3900,12 @@ static void ast_rtp_prop_set(struct ast_
+@@ -3875,10 +3903,12 @@ static void ast_rtp_prop_set(struct ast_
ast_debug(1, "Setup RTCP on RTP instance '%p'\n", instance);
rtp->rtcp->schedid = -1;
@@ -344,7 +344,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
return;
} else {
-@@ -4352,12 +4382,14 @@ static int rtp_reload(int reload)
+@@ -4356,12 +4386,14 @@ static int rtp_reload(int reload)
* the pool this will cause a small memory leak.
*/
@@ -359,7 +359,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
if (cfg) {
if ((s = ast_variable_retrieve(cfg, "general", "rtpstart"))) {
-@@ -4408,6 +4440,7 @@ static int rtp_reload(int reload)
+@@ -4412,6 +4444,7 @@ static int rtp_reload(int reload)
DEFAULT_LEARNING_MIN_SEQUENTIAL);
}
}
@@ -367,7 +367,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
if ((s = ast_variable_retrieve(cfg, "general", "icesupport"))) {
icesupport = ast_true(s);
}
-@@ -4435,6 +4468,7 @@ static int rtp_reload(int reload)
+@@ -4439,6 +4472,7 @@ static int rtp_reload(int reload)
if ((s = ast_variable_retrieve(cfg, "general", "turnpassword"))) {
pj_strdup2(pool, &turnpassword, s);
}
@@ -375,7 +375,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
ast_config_destroy(cfg);
}
if (rtpstart >= rtpend) {
-@@ -4454,6 +4488,7 @@ static int reload_module(void)
+@@ -4458,6 +4492,7 @@ static int reload_module(void)
static int load_module(void)
{
@@ -383,7 +383,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
pj_lock_t *lock;
pj_log_set_level(0);
-@@ -4501,23 +4536,28 @@ static int load_module(void)
+@@ -4505,23 +4540,28 @@ static int load_module(void)
pj_shutdown();
return AST_MODULE_LOAD_DECLINE;
}
@@ -412,7 +412,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
return AST_MODULE_LOAD_DECLINE;
}
-@@ -4531,6 +4571,7 @@ static int unload_module(void)
+@@ -4535,6 +4575,7 @@ static int unload_module(void)
ast_rtp_engine_unregister(&asterisk_rtp_engine);
ast_cli_unregister_multiple(cli_rtp, ARRAY_LEN(cli_rtp));
@@ -420,7 +420,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
worker_terminate = 1;
pj_thread_register_check();
-@@ -4540,6 +4581,7 @@ static int unload_module(void)
+@@ -4544,6 +4585,7 @@ static int unload_module(void)
pj_caching_pool_destroy(&cachingpool);
pj_shutdown();
diff --git a/debian/patches/safe_asterisk-config b/debian/patches/safe_asterisk-config
index 966fad0..f596b1f 100644
--- a/debian/patches/safe_asterisk-config
+++ b/debian/patches/safe_asterisk-config
@@ -6,7 +6,7 @@ Last-Update: 2010-02-14
--- a/contrib/scripts/safe_asterisk
+++ b/contrib/scripts/safe_asterisk
-@@ -107,7 +107,7 @@ ulimit -c unlimited
+@@ -109,7 +109,7 @@ ulimit -c unlimited
# Don't fork when running "safely"
#
ASTARGS=""
@@ -15,7 +15,7 @@ Last-Update: 2010-02-14
if test -c /dev/tty${TTY} ; then
TTY=tty${TTY}
elif test -c /dev/vc/${TTY} ; then
-@@ -147,7 +147,7 @@ run_asterisk()
+@@ -159,7 +159,7 @@ run_asterisk()
{
while :; do
diff --git a/debian/patches/safe_asterisk-nobg b/debian/patches/safe_asterisk-nobg
index 79000f2..668923b 100644
--- a/debian/patches/safe_asterisk-nobg
+++ b/debian/patches/safe_asterisk-nobg
@@ -12,7 +12,7 @@ init script. After that, it can safely go upstream.
--- a/contrib/scripts/safe_asterisk
+++ b/contrib/scripts/safe_asterisk
-@@ -22,6 +22,7 @@ DUMPDROP=${DUMPDROP:-/tmp}
+@@ -18,6 +18,7 @@ DUMPDROP=${DUMPDROP:-/tmp}
RUNDIR=${RUNDIR:-/tmp}
SLEEPSECS=4
ASTPIDFILE=${ASTVARRUNDIR}/asterisk.pid
@@ -20,7 +20,7 @@ init script. After that, it can safely go upstream.
# comment this line out to have this script _not_ kill all mpg123 processes when
# asterisk exits
-@@ -215,4 +216,8 @@ run_asterisk()
+@@ -211,4 +212,8 @@ run_asterisk()
done
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/asterisk.git
More information about the Pkg-voip-commits
mailing list