summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--comms/asterisk/Makefile14
-rw-r--r--comms/asterisk/PLIST19
-rw-r--r--comms/asterisk/distinfo20
-rw-r--r--comms/asterisk/patches/patch-apps_app__queue.c136
4 files changed, 120 insertions, 69 deletions
diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile
index c0421cfc5e8..6689c72ba17 100644
--- a/comms/asterisk/Makefile
+++ b/comms/asterisk/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.136 2016/04/11 19:01:43 ryoon Exp $
+# $NetBSD: Makefile,v 1.137 2016/05/05 02:00:33 jnemeth Exp $
#
# NOTE: when updating this package, there are two places that sound
-# tarballs need to be checked
+# tarballs need to be checked; look win ${WRKSRC}/sounds/Makefile
+# to find out the current sound file versions
-DISTNAME= asterisk-11.21.1
-PKGREVISION= 2
+DISTNAME= asterisk-11.22.0
CATEGORIES= comms net audio
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \
@@ -131,7 +131,7 @@ PLIST.mgcp= yes
.include "options.mk"
# check sounds/Makefile for current version when upgrading package
-DISTFILES+= asterisk-extra-sounds-en-gsm-1.4.15.tar.gz
+DISTFILES+= asterisk-extra-sounds-en-gsm-1.5.tar.gz
# Override default paths in config files
SUBST_CLASSES+= configs
@@ -234,9 +234,9 @@ post-patch:
post-install:
# check sounds directory for current versions when upgrading package
- ${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.27.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
+ ${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.5.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
${TAR} xzf ${WRKSRC}/sounds/asterisk-moh-opsound-wav-2.03.tar.gz -C ${DESTDIR}${ASTDATADIR}/moh
- ${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
+ ${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/asterisk-extra-sounds-en-gsm-1.5.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
${INSTALL_DATA} ${WRKSRC}/BUGS ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/CHANGES ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
diff --git a/comms/asterisk/PLIST b/comms/asterisk/PLIST
index 0afbe20d648..38a282b0e4f 100644
--- a/comms/asterisk/PLIST
+++ b/comms/asterisk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2015/10/27 08:49:01 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.12 2016/05/05 02:00:33 jnemeth Exp $
include/asterisk.h
include/asterisk/_private.h
include/asterisk/abstract_jb.h
@@ -383,15 +383,15 @@ libdata/asterisk/phoneprov/000000000000.cfg
libdata/asterisk/phoneprov/polycom.xml
libdata/asterisk/phoneprov/polycom_line.xml
libdata/asterisk/phoneprov/snom-mac.xml
-libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.27
+libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.5
libdata/asterisk/sounds/en/1-for-am-2-for-pm.gsm
libdata/asterisk/sounds/en/1-yes-2-no.gsm
-libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.27
-libdata/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.15
-libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.27
-libdata/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.4.15
-libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.27
-libdata/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.4.15
+libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.5
+libdata/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.5
+libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.5
+libdata/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.5
+libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.5
+libdata/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.5
libdata/asterisk/sounds/en/OfficeSpace.gsm
libdata/asterisk/sounds/en/Randulo-allison.gsm
libdata/asterisk/sounds/en/SIP_Test_Failure.gsm
@@ -469,7 +469,6 @@ libdata/asterisk/sounds/en/astcc-account-number-invalid.gsm
libdata/asterisk/sounds/en/astcc-balance-of-account-is.gsm
libdata/asterisk/sounds/en/astcc-card-number-invalid.gsm
libdata/asterisk/sounds/en/astcc-digit-account-number.gsm
-libdata/asterisk/sounds/en/astcc-followed-by-pound.gsm
libdata/asterisk/sounds/en/astcc-followed-by-the-hash-key.gsm
libdata/asterisk/sounds/en/astcc-followed-by-the-pound-key.gsm
libdata/asterisk/sounds/en/astcc-login12pound.gsm
@@ -1605,6 +1604,7 @@ libdata/asterisk/sounds/en/please-hold-minion-connect.gsm
libdata/asterisk/sounds/en/please-hold-while-minion.gsm
libdata/asterisk/sounds/en/please-try-again-later.gsm
libdata/asterisk/sounds/en/please-try-again.gsm
+libdata/asterisk/sounds/en/please-try-call-later.gsm
libdata/asterisk/sounds/en/please-try.gsm
libdata/asterisk/sounds/en/please-wait-connect-oncall-eng.gsm
libdata/asterisk/sounds/en/pls-ent-num-transfer.gsm
@@ -1621,7 +1621,6 @@ libdata/asterisk/sounds/en/pls-rcrd-name-at-tone.gsm
libdata/asterisk/sounds/en/pls-stay-on-line.gsm
libdata/asterisk/sounds/en/pls-try-again.gsm
libdata/asterisk/sounds/en/pls-try-area-code.gsm
-libdata/asterisk/sounds/en/pls-try-call-later.gsm
libdata/asterisk/sounds/en/pls-try-manually.gsm
libdata/asterisk/sounds/en/pls-wait-connect-call.gsm
libdata/asterisk/sounds/en/plugh.gsm
diff --git a/comms/asterisk/distinfo b/comms/asterisk/distinfo
index 62e20d6c2b5..6e8e285c7f3 100644
--- a/comms/asterisk/distinfo
+++ b/comms/asterisk/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.77 2016/02/07 08:18:43 jnemeth Exp $
+$NetBSD: distinfo,v 1.78 2016/05/05 02:00:33 jnemeth Exp $
-SHA1 (asterisk-11.21.1/asterisk-11.21.1.tar.gz) = da4035d81d8bac2cbd6eb2cc2bea564969403f89
-RMD160 (asterisk-11.21.1/asterisk-11.21.1.tar.gz) = b9600c82dc6eda53fbf53884b53a3d3bd2f2e54d
-SHA512 (asterisk-11.21.1/asterisk-11.21.1.tar.gz) = d52a14ebae872d62cbfa676bfd86b28790d8e9cfad97585e9255cf9e8ca1957dae509d41ac46cd5280478d38707bc9628bafb31551ab8345e7064aabdbd5dea3
-Size (asterisk-11.21.1/asterisk-11.21.1.tar.gz) = 34867941 bytes
-SHA1 (asterisk-11.21.1/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = fbb94494e31fc08eee8fdf2ce7d12eb274018050
-RMD160 (asterisk-11.21.1/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 53656a3d6771602504f220ad312093e3503e1150
-SHA512 (asterisk-11.21.1/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 3908fcb439fe7d08dc6cba45b7a6aeea9825299871332d30f60535957072521b2f3f60222a49689b6fe1f693f80e3605b91ce395d16e15b15c50025eb086c19b
-Size (asterisk-11.21.1/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 4409969 bytes
+SHA1 (asterisk-11.22.0/asterisk-11.22.0.tar.gz) = 3884224163d8d9b1b55e5eee39744a20d87fc4e8
+RMD160 (asterisk-11.22.0/asterisk-11.22.0.tar.gz) = 5858b23dcfbe458a75cfc81aeabbe5df04f70ef2
+SHA512 (asterisk-11.22.0/asterisk-11.22.0.tar.gz) = 98085053fc8d2aaf1c3305ef1900287bc1ee9d1e421a073cb0e1b56d379fd7803fdbfaab16143be24bdd41a7b28305dce7b91763564e750697ac2b2d9e8ad719
+Size (asterisk-11.22.0/asterisk-11.22.0.tar.gz) = 35101090 bytes
+SHA1 (asterisk-11.22.0/asterisk-extra-sounds-en-gsm-1.5.tar.gz) = 831ae6442e23cbef1e7d1c84798778ad0b0524d1
+RMD160 (asterisk-11.22.0/asterisk-extra-sounds-en-gsm-1.5.tar.gz) = d52df795201c53fc4cd7d99ed41516e312f6f0f3
+SHA512 (asterisk-11.22.0/asterisk-extra-sounds-en-gsm-1.5.tar.gz) = c7d3c3fd2c854e6776801312d34bf69bbed78a443c16121637f508c5275f18b1d415cbb6e4f6f8c5aa3769cbbfa1a11485b9972053777f3ac39256c2c81729f1
+Size (asterisk-11.22.0/asterisk-extra-sounds-en-gsm-1.5.tar.gz) = 4256538 bytes
SHA1 (patch-Makefile) = 5fd774779d3c8d85936beca8a3407dd3011af2dc
SHA1 (patch-addons_chan__ooh323.c) = 57f61a2edf0f9f022e03837230ee572ec9cf47b4
SHA1 (patch-apps_app__confbridge.c) = c815905994355a19c32e8e3e2eb5dc9f1679eb29
@@ -16,7 +16,7 @@ SHA1 (patch-apps_app__dumpchan.c) = f5a5cc776c99875d1c58e60953fb3f4cec27a94f
SHA1 (patch-apps_app__followme.c) = 0b362486e1759099b61d42a9880109c5743fa0bc
SHA1 (patch-apps_app__meetme.c) = 3927b77fac1cd69f58df4e2ec783359ed0135dad
SHA1 (patch-apps_app__osplookup.c) = 692776511b6a970d29db5fdef9d68af2a3ef6e35
-SHA1 (patch-apps_app__queue.c) = c0f477c45c18c1457386f1cbb6bbff74187fc3ca
+SHA1 (patch-apps_app__queue.c) = ffed7ef3133d924ef7d176a4f30f369bdd245a42
SHA1 (patch-apps_app__skel.c) = e661a53b61d36343c54be7ad9ea6cde6cb10f180
SHA1 (patch-apps_app__sms.c) = d89b27a9df04d4da98d562241c07d25d182baefc
SHA1 (patch-apps_app__voicemail.c) = 692551a10f51729dd23aa304117eccfb3978c1c8
diff --git a/comms/asterisk/patches/patch-apps_app__queue.c b/comms/asterisk/patches/patch-apps_app__queue.c
index 80e4834edad..36367feb191 100644
--- a/comms/asterisk/patches/patch-apps_app__queue.c
+++ b/comms/asterisk/patches/patch-apps_app__queue.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-apps_app__queue.c,v 1.5 2015/05/19 07:52:14 jnemeth Exp $
+$NetBSD: patch-apps_app__queue.c,v 1.6 2016/05/05 02:00:33 jnemeth Exp $
---- apps/app_queue.c.orig 2015-03-22 23:55:25.000000000 +0000
+--- apps/app_queue.c.orig 2016-03-29 19:25:17.000000000 +0000
+++ apps/app_queue.c
-@@ -4043,8 +4043,8 @@ static void record_abandoned(struct queu
+@@ -4075,8 +4075,8 @@ static void record_abandoned(struct queu
"Uniqueid: %s\r\n"
"Position: %d\r\n"
"OriginalPosition: %d\r\n"
@@ -13,7 +13,81 @@ $NetBSD: patch-apps_app__queue.c,v 1.5 2015/05/19 07:52:14 jnemeth Exp $
qe->parent->callsabandoned++;
ao2_unlock(qe->parent);
-@@ -4816,7 +4816,7 @@ static int wait_our_turn(struct queue_en
+@@ -4196,8 +4196,8 @@ static struct callattempt *wait_for_answ
+ struct ast_channel *in = qe->chan;
+ char on[80] = "";
+ char membername[80] = "";
+- long starttime = 0;
+- long endtime = 0;
++ time_t starttime = 0;
++ time_t endtime = 0;
+ #ifdef HAVE_EPOLL
+ struct callattempt *epollo;
+ #endif
+@@ -4211,7 +4211,7 @@ static struct callattempt *wait_for_answ
+ inchan_name = ast_strdupa(ast_channel_name(qe->chan));
+ ast_channel_unlock(qe->chan);
+
+- starttime = (long) time(NULL);
++ starttime = time(NULL);
+ #ifdef HAVE_EPOLL
+ for (epollo = outgoing; epollo; epollo = epollo->q_next) {
+ if (epollo->chan) {
+@@ -4482,7 +4482,7 @@ static struct callattempt *wait_for_answ
+ ast_cdr_busy(ast_channel_cdr(in));
+ }
+ do_hang(o);
+- endtime = (long) time(NULL);
++ endtime = time(NULL);
+ endtime -= starttime;
+ rna(endtime * 1000, qe, on, membername, qe->parent->autopausebusy);
+ if (qe->parent->strategy != QUEUE_STRATEGY_RINGALL) {
+@@ -4492,7 +4492,7 @@ static struct callattempt *wait_for_answ
+ /* Have enough time for a queue member to answer? */
+ if (ast_remaining_ms(start_time_tv, orig) > 500) {
+ ring_one(qe, outgoing, &numbusies);
+- starttime = (long) time(NULL);
++ starttime = time(NULL);
+ }
+ }
+ numbusies++;
+@@ -4502,7 +4502,7 @@ static struct callattempt *wait_for_answ
+ if (ast_channel_cdr(in)) {
+ ast_cdr_busy(ast_channel_cdr(in));
+ }
+- endtime = (long) time(NULL);
++ endtime = time(NULL);
+ endtime -= starttime;
+ rna(endtime * 1000, qe, on, membername, qe->parent->autopauseunavail);
+ do_hang(o);
+@@ -4512,7 +4512,7 @@ static struct callattempt *wait_for_answ
+ }
+ if (ast_remaining_ms(start_time_tv, orig) > 500) {
+ ring_one(qe, outgoing, &numbusies);
+- starttime = (long) time(NULL);
++ starttime = time(NULL);
+ }
+ }
+ numbusies++;
+@@ -4598,7 +4598,7 @@ static struct callattempt *wait_for_answ
+ }
+ ast_frfree(f);
+ } else { /* ast_read() returned NULL */
+- endtime = (long) time(NULL) - starttime;
++ endtime = time(NULL) - starttime;
+ rna(endtime * 1000, qe, on, membername, 1);
+ do_hang(o);
+ if (qe->parent->strategy != QUEUE_STRATEGY_RINGALL) {
+@@ -4607,7 +4607,7 @@ static struct callattempt *wait_for_answ
+ }
+ if (ast_remaining_ms(start_time_tv, orig) > 500) {
+ ring_one(qe, outgoing, &numbusies);
+- starttime = (long) time(NULL);
++ starttime = time(NULL);
+ }
+ }
+ }
+@@ -4853,7 +4853,7 @@ static int wait_our_turn(struct queue_en
if ((status = get_member_status(qe->parent, qe->max_penalty, qe->min_penalty, qe->parent->leavewhenempty, 0))) {
*reason = QUEUE_LEAVEEMPTY;
@@ -22,7 +96,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.5 2015/05/19 07:52:14 jnemeth Exp $
leave_queue(qe);
break;
}
-@@ -5056,12 +5056,12 @@ static void send_agent_complete(const st
+@@ -5103,12 +5103,12 @@ static void send_agent_complete(const st
"Channel: %s\r\n"
"Member: %s\r\n"
"MemberName: %s\r\n"
@@ -38,7 +112,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.5 2015/05/19 07:52:14 jnemeth Exp $
qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, vars_len) : "");
}
-@@ -5104,9 +5104,9 @@ static void queue_transfer_fixup(void *d
+@@ -5151,9 +5151,9 @@ static void queue_transfer_fixup(void *d
int callcompletedinsl = qtds->callcompletedinsl;
struct ast_datastore *datastore;
@@ -51,7 +125,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.5 2015/05/19 07:52:14 jnemeth Exp $
update_queue(qe->parent, member, callcompletedinsl, (time(NULL) - callstart));
-@@ -5624,7 +5624,7 @@ static int try_calling(struct queue_ent
+@@ -5674,7 +5674,7 @@ static int try_calling(struct queue_ent
} else if (ast_check_hangup(qe->chan)) {
/* Caller must have hung up just before being connected */
ast_log(LOG_NOTICE, "Caller was about to talk to agent on %s but the caller hungup.\n", ast_channel_name(peer));
@@ -60,7 +134,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.5 2015/05/19 07:52:14 jnemeth Exp $
record_abandoned(qe);
ast_autoservice_chan_hangup_peer(qe->chan, peer);
ao2_ref(member, -1);
-@@ -5664,8 +5664,8 @@ static int try_calling(struct queue_ent
+@@ -5714,8 +5714,8 @@ static int try_calling(struct queue_ent
/* if setinterfacevar is defined, make member variables available to the channel */
/* use pbx_builtin_setvar to set a load of variables with one call */
if (qe->parent->setinterfacevar) {
@@ -71,7 +145,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.5 2015/05/19 07:52:14 jnemeth Exp $
pbx_builtin_setvar_multiple(qe->chan, interfacevar);
pbx_builtin_setvar_multiple(peer, interfacevar);
}
-@@ -5673,8 +5673,8 @@ static int try_calling(struct queue_ent
+@@ -5723,8 +5723,8 @@ static int try_calling(struct queue_ent
/* if setqueueentryvar is defined, make queue entry (i.e. the caller) variables available to the channel */
/* use pbx_builtin_setvar to set a load of variables with one call */
if (qe->parent->setqueueentryvar) {
@@ -82,18 +156,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.5 2015/05/19 07:52:14 jnemeth Exp $
pbx_builtin_setvar_multiple(qe->chan, interfacevar);
pbx_builtin_setvar_multiple(peer, interfacevar);
}
-@@ -5891,8 +5891,8 @@ static int try_calling(struct queue_ent
- }
- }
- qe->handled++;
-- ast_queue_log(queuename, ast_channel_uniqueid(qe->chan), member->membername, "CONNECT", "%ld|%s|%ld", (long) (time(NULL) - qe->start), ast_channel_uniqueid(peer),
-- (long)(orig - to > 0 ? (orig - to) / 1000 : 0));
-+ ast_queue_log(queuename, ast_channel_uniqueid(qe->chan), member->membername, "CONNECT", "%jd|%s|%jd", (intmax_t) (time(NULL) - qe->start), ast_channel_uniqueid(peer),
-+ (intmax_t)(orig - to > 0 ? (orig - to) / 1000 : 0));
-
- if (ast_channel_cdr(qe->chan)) {
- struct ast_cdr *cdr;
-@@ -5946,12 +5946,12 @@ static int try_calling(struct queue_ent
+@@ -6018,12 +6018,12 @@ static int try_calling(struct queue_ent
"Channel: %s\r\n"
"Member: %s\r\n"
"MemberName: %s\r\n"
@@ -109,7 +172,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.5 2015/05/19 07:52:14 jnemeth Exp $
qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, sizeof(vars)) : "");
ast_copy_string(oldcontext, ast_channel_context(qe->chan), sizeof(oldcontext));
ast_copy_string(oldexten, ast_channel_exten(qe->chan), sizeof(oldexten));
-@@ -5983,17 +5983,17 @@ static int try_calling(struct queue_ent
+@@ -6055,17 +6055,17 @@ static int try_calling(struct queue_ent
/* detect a blind transfer */
if (!(ast_channel_softhangup_internal_flag(qe->chan) | ast_channel_softhangup_internal_flag(peer)) && (strcasecmp(oldcontext, ast_channel_context(qe->chan)) || strcasecmp(oldexten, ast_channel_exten(qe->chan)))) {
@@ -134,7 +197,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.5 2015/05/19 07:52:14 jnemeth Exp $
send_agent_complete(qe, queuename, peer, member, callstart, vars, sizeof(vars), AGENT);
}
if ((tds = ast_channel_datastore_find(qe->chan, &queue_transfer_info, NULL))) {
-@@ -7126,8 +7126,8 @@ static int queue_exec(struct ast_channel
+@@ -7234,8 +7234,8 @@ static int queue_exec(struct ast_channel
}
}
@@ -145,7 +208,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.5 2015/05/19 07:52:14 jnemeth Exp $
qe.chan = chan;
qe.prio = prio;
-@@ -7177,8 +7177,8 @@ check_turns:
+@@ -7285,8 +7285,8 @@ check_turns:
record_abandoned(&qe);
reason = QUEUE_TIMEOUT;
res = 0;
@@ -156,7 +219,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.5 2015/05/19 07:52:14 jnemeth Exp $
break;
}
-@@ -7222,7 +7222,7 @@ check_turns:
+@@ -7331,7 +7331,7 @@ check_turns:
if ((status = get_member_status(qe.parent, qe.max_penalty, qe.min_penalty, qe.parent->leavewhenempty, 0))) {
record_abandoned(&qe);
reason = QUEUE_LEAVEEMPTY;
@@ -165,7 +228,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.5 2015/05/19 07:52:14 jnemeth Exp $
res = 0;
break;
}
-@@ -7244,7 +7244,7 @@ check_turns:
+@@ -7354,7 +7354,7 @@ check_turns:
record_abandoned(&qe);
reason = QUEUE_TIMEOUT;
res = 0;
@@ -174,7 +237,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.5 2015/05/19 07:52:14 jnemeth Exp $
break;
}
-@@ -7272,8 +7272,8 @@ stop:
+@@ -7382,8 +7382,8 @@ stop:
if (!qe.handled) {
record_abandoned(&qe);
ast_queue_log(args.queuename, ast_channel_uniqueid(chan), "NONE", "ABANDON",
@@ -185,7 +248,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.5 2015/05/19 07:52:14 jnemeth Exp $
res = -1;
} else if (qcontinue) {
reason = QUEUE_CONTINUE;
-@@ -7281,7 +7281,7 @@ stop:
+@@ -7391,7 +7391,7 @@ stop:
}
} else if (qe.valid_digits) {
ast_queue_log(args.queuename, ast_channel_uniqueid(chan), "NONE", "EXITWITHKEY",
@@ -194,18 +257,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.5 2015/05/19 07:52:14 jnemeth Exp $
}
}
-@@ -8404,8 +8404,8 @@ static char *__queues_show(struct manses
- mem->paused ? " (paused)" : "",
- ast_devstate2str(mem->status));
- if (mem->calls) {
-- ast_str_append(&out, 0, " has taken %d calls (last was %ld secs ago)",
-- mem->calls, (long) (time(NULL) - mem->lastcall));
-+ ast_str_append(&out, 0, " has taken %d calls (last was %jd secs ago)",
-+ mem->calls, (intmax_t) (time(NULL) - mem->lastcall));
- } else {
- ast_str_append(&out, 0, " has taken no calls yet");
- }
-@@ -8422,9 +8422,9 @@ static char *__queues_show(struct manses
+@@ -8538,9 +8538,9 @@ static char *__queues_show(struct manses
do_print(s, fd, " Callers: ");
for (qe = q->head; qe; qe = qe->next) {
@@ -218,7 +270,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.5 2015/05/19 07:52:14 jnemeth Exp $
do_print(s, fd, ast_str_buffer(out));
}
}
-@@ -8782,7 +8782,7 @@ static int manager_queues_status(struct
+@@ -8900,7 +8900,7 @@ static int manager_queues_status(struct
"CallerIDName: %s\r\n"
"ConnectedLineNum: %s\r\n"
"ConnectedLineName: %s\r\n"
@@ -227,7 +279,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.5 2015/05/19 07:52:14 jnemeth Exp $
"%s"
"\r\n",
q->name, pos++, ast_channel_name(qe->chan), ast_channel_uniqueid(qe->chan),
-@@ -8790,7 +8790,7 @@ static int manager_queues_status(struct
+@@ -8908,7 +8908,7 @@ static int manager_queues_status(struct
S_COR(ast_channel_caller(qe->chan)->id.name.valid, ast_channel_caller(qe->chan)->id.name.str, "unknown"),
S_COR(ast_channel_connected(qe->chan)->id.number.valid, ast_channel_connected(qe->chan)->id.number.str, "unknown"),
S_COR(ast_channel_connected(qe->chan)->id.name.valid, ast_channel_connected(qe->chan)->id.name.str, "unknown"),
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-02 23:38:22 +0000