1.1 --- a/asterisk/asterisk.patch Thu Sep 15 19:34:00 2011 +0200
1.2 +++ b/asterisk/asterisk.patch Thu Sep 15 19:40:20 2011 +0200
1.3 @@ -1,8 +1,8 @@
1.4 Index: addons/chan_ooh323.c
1.5 diff -Nau addons/chan_ooh323.c.orig addons/chan_ooh323.c
1.6 ---- addons/chan_ooh323.c.orig 2011-02-18 01:07:20.000000000 +0100
1.7 -+++ addons/chan_ooh323.c 2011-05-23 17:35:28.331029567 +0200
1.8 -@@ -23,6 +23,12 @@
1.9 +--- addons/chan_ooh323.c.orig 2011-08-09 18:13:09.000000000 +0200
1.10 ++++ addons/chan_ooh323.c 2011-09-14 14:29:50.740457577 +0200
1.11 +@@ -24,6 +24,12 @@
1.12
1.13 #include "chan_ooh323.h"
1.14 #include <math.h>
1.15 @@ -17,8 +17,8 @@
1.16
1.17 Index: addons/ooh323c/src/ooCmdChannel.c
1.18 diff -Nau addons/ooh323c/src/ooCmdChannel.c.orig addons/ooh323c/src/ooCmdChannel.c
1.19 ---- addons/ooh323c/src/ooCmdChannel.c.orig 2010-03-26 00:38:58.000000000 +0100
1.20 -+++ addons/ooh323c/src/ooCmdChannel.c 2011-05-23 17:35:28.331029567 +0200
1.21 +--- addons/ooh323c/src/ooCmdChannel.c.orig 2011-08-04 21:37:16.000000000 +0200
1.22 ++++ addons/ooh323c/src/ooCmdChannel.c 2011-09-14 14:29:50.740457577 +0200
1.23 @@ -25,6 +25,10 @@
1.24 #include "ooCalls.h"
1.25 #include "ooCmdChannel.h"
1.26 @@ -32,8 +32,8 @@
1.27 extern OOH323EndPoint gH323ep;
1.28 Index: addons/ooh323c/src/ooSocket.c
1.29 diff -Nau addons/ooh323c/src/ooSocket.c.orig addons/ooh323c/src/ooSocket.c
1.30 ---- addons/ooh323c/src/ooSocket.c.orig 2011-02-16 21:21:17.000000000 +0100
1.31 -+++ addons/ooh323c/src/ooSocket.c 2011-05-23 17:35:28.331029567 +0200
1.32 +--- addons/ooh323c/src/ooSocket.c.orig 2011-05-04 22:50:18.000000000 +0200
1.33 ++++ addons/ooh323c/src/ooSocket.c 2011-09-14 14:29:50.740457577 +0200
1.34 @@ -24,6 +24,9 @@
1.35
1.36 #include "ooSocket.h"
1.37 @@ -47,7 +47,7 @@
1.38 Index: addons/ooh323cDriver.c
1.39 diff -Nau addons/ooh323cDriver.c.orig addons/ooh323cDriver.c
1.40 --- addons/ooh323cDriver.c.orig 2011-02-18 01:07:20.000000000 +0100
1.41 -+++ addons/ooh323cDriver.c 2011-05-23 17:35:28.338530899 +0200
1.42 ++++ addons/ooh323cDriver.c 2011-09-14 14:29:50.740457577 +0200
1.43 @@ -27,6 +27,11 @@
1.44
1.45 #define SEC_TO_HOLD_THREAD 24
1.46 @@ -63,7 +63,7 @@
1.47 Index: apps/app_backticks.c
1.48 diff -Nau apps/app_backticks.c.orig apps/app_backticks.c
1.49 --- apps/app_backticks.c.orig 1970-01-01 01:00:00.000000000 +0100
1.50 -+++ apps/app_backticks.c 2011-05-23 17:35:28.338530899 +0200
1.51 ++++ apps/app_backticks.c 2011-09-14 14:29:50.740457577 +0200
1.52 @@ -0,0 +1,129 @@
1.53 +
1.54 +#include "asterisk.h"
1.55 @@ -196,9 +196,9 @@
1.56 +
1.57 Index: apps/app_meetme.c
1.58 diff -Nau apps/app_meetme.c.orig apps/app_meetme.c
1.59 ---- apps/app_meetme.c.orig 2011-01-29 19:09:37.000000000 +0100
1.60 -+++ apps/app_meetme.c 2011-05-23 17:35:28.338530899 +0200
1.61 -@@ -604,6 +604,7 @@
1.62 +--- apps/app_meetme.c.orig 2011-07-19 17:43:32.000000000 +0200
1.63 ++++ apps/app_meetme.c 2011-09-14 14:29:50.747960016 +0200
1.64 +@@ -606,6 +606,7 @@
1.65 CONFFLAG_DURATION_LIMIT = (1 << 30),
1.66 /*! Do not write any audio to this channel until the state is up. */
1.67 CONFFLAG_NO_AUDIO_UNTIL_UP = (1 << 31),
1.68 @@ -206,7 +206,7 @@
1.69 };
1.70
1.71 /* !If set play an intro announcement at start of conference */
1.72 -@@ -617,6 +618,7 @@
1.73 +@@ -619,6 +620,7 @@
1.74 OPT_ARG_MOH_CLASS = 4,
1.75 OPT_ARG_INTROMSG = 5,
1.76 OPT_ARG_ARRAY_SIZE = 6,
1.77 @@ -214,7 +214,7 @@
1.78 };
1.79
1.80 AST_APP_OPTIONS(meetme_opts, BEGIN_OPTIONS
1.81 -@@ -650,6 +652,7 @@
1.82 +@@ -652,6 +654,7 @@
1.83 AST_APP_OPTION('1', CONFFLAG_NOONLYPERSON ),
1.84 AST_APP_OPTION_ARG('S', CONFFLAG_DURATION_STOP, OPT_ARG_DURATION_STOP),
1.85 AST_APP_OPTION_ARG('L', CONFFLAG_DURATION_LIMIT, OPT_ARG_DURATION_LIMIT),
1.86 @@ -222,7 +222,7 @@
1.87 END_OPTIONS );
1.88
1.89 static const char * const app = "MeetMe";
1.90 -@@ -2437,6 +2440,12 @@
1.91 +@@ -2447,6 +2450,12 @@
1.92 ast_test_flag64(confflags, CONFFLAG_INTROUSERNOREVIEW))) {
1.93 char destdir[PATH_MAX];
1.94
1.95 @@ -235,7 +235,7 @@
1.96 snprintf(destdir, sizeof(destdir), "%s/meetme", ast_config_AST_SPOOL_DIR);
1.97
1.98 if (ast_mkdir(destdir, 0777) != 0) {
1.99 -@@ -2453,6 +2462,7 @@
1.100 +@@ -2463,6 +2472,7 @@
1.101 res = ast_record_review(chan, "vm-rec-name", user->namerecloc, 10, "sln", &duration, NULL);
1.102 if (res == -1)
1.103 goto outrun;
1.104 @@ -245,9 +245,9 @@
1.105 ast_mutex_lock(&conf->playlock);
1.106 Index: apps/app_voicemail.c
1.107 diff -Nau apps/app_voicemail.c.orig apps/app_voicemail.c
1.108 ---- apps/app_voicemail.c.orig 2011-02-08 20:41:42.000000000 +0100
1.109 -+++ apps/app_voicemail.c 2011-05-23 17:35:28.348531751 +0200
1.110 -@@ -366,6 +366,7 @@
1.111 +--- apps/app_voicemail.c.orig 2011-07-26 16:04:55.000000000 +0200
1.112 ++++ apps/app_voicemail.c 2011-09-14 14:29:50.747960016 +0200
1.113 +@@ -373,6 +373,7 @@
1.114 static char imapport[8];
1.115 static char imapflags[128];
1.116 static char imapfolder[64];
1.117 @@ -255,7 +255,7 @@
1.118 static char imapparentfolder[64] = "\0";
1.119 static char greetingfolder[64];
1.120 static char authuser[32];
1.121 -@@ -2464,7 +2465,7 @@
1.122 +@@ -2504,7 +2505,7 @@
1.123 }
1.124
1.125 /* Build up server information */
1.126 @@ -264,7 +264,7 @@
1.127
1.128 /* Add authentication user if present */
1.129 if (!ast_strlen_zero(authuser))
1.130 -@@ -6073,6 +6074,7 @@
1.131 +@@ -6161,6 +6162,7 @@
1.132 /* simple. huh? */
1.133 char sequence[10];
1.134 char mailbox[256];
1.135 @@ -272,7 +272,7 @@
1.136 int res;
1.137
1.138 /* get the real IMAP message number for this message */
1.139 -@@ -6088,10 +6090,24 @@
1.140 +@@ -6176,10 +6178,24 @@
1.141 mail_setflag(vms->mailstream, sequence, "\\Unseen");
1.142 mail_clearflag(vms->mailstream, sequence, "\\Seen");
1.143 }
1.144 @@ -299,7 +299,7 @@
1.145 /* Create the folder if it don't exist */
1.146 imap_mailbox_name(mailbox, sizeof(mailbox), vms, box, 1); /* Get the full mailbox name */
1.147 ast_debug(5, "Checking if folder exists: %s\n", mailbox);
1.148 -@@ -10264,6 +10280,10 @@
1.149 +@@ -10383,6 +10399,10 @@
1.150 #ifndef IMAP_STORAGE
1.151 } else if (!cmd) {
1.152 vms.deleted[vms.curmsg] = 1;
1.153 @@ -310,7 +310,7 @@
1.154 #endif
1.155 } else {
1.156 vms.deleted[vms.curmsg] = 0;
1.157 -@@ -11731,6 +11751,15 @@
1.158 +@@ -11874,6 +11894,15 @@
1.159 } else {
1.160 ast_copy_string(imapfolder, "INBOX", sizeof(imapfolder));
1.161 }
1.162 @@ -326,53 +326,63 @@
1.163 if ((val = ast_variable_retrieve(cfg, "general", "imapparentfolder"))) {
1.164 ast_copy_string(imapparentfolder, val, sizeof(imapparentfolder));
1.165 }
1.166 -Index: apps/.moduleinfo
1.167 -diff -Nau apps/.moduleinfo.orig apps/.moduleinfo
1.168 ---- apps/.moduleinfo.orig 2011-05-09 22:22:47.000000000 +0200
1.169 -+++ apps/.moduleinfo 2011-05-23 17:35:28.348531751 +0200
1.170 -@@ -72,7 +72,7 @@
1.171 - <member name="app_image" displayname="Image Transmission Application" remove_on_change="apps/app_image.o apps/app_image.so">
1.172 - </member>
1.173 - <member name="app_ivrdemo" displayname="IVR Demo Application" remove_on_change="apps/app_ivrdemo.o apps/app_ivrdemo.so">
1.174 -- <defaultenabled>no</defaultenabled>
1.175 -+ <defaultenabled>yes</defaultenabled>
1.176 - </member>
1.177 - <member name="app_jack" displayname="JACK Interface" remove_on_change="apps/app_jack.o apps/app_jack.so">
1.178 - <depend>jack</depend>
1.179 -@@ -127,10 +127,10 @@
1.180 - <member name="app_rpt" displayname="Radio Repeater/Remote Base Application" remove_on_change="apps/app_rpt.o apps/app_rpt.so">
1.181 - <depend>dahdi</depend>
1.182 - <depend>tonezone</depend>
1.183 -- <defaultenabled>no</defaultenabled>
1.184 -+ <defaultenabled>yes</defaultenabled>
1.185 - </member>
1.186 - <member name="app_saycounted" displayname="Decline words according to channel language" remove_on_change="apps/app_saycounted.o apps/app_saycounted.so">
1.187 -- <defaultenabled>no</defaultenabled>
1.188 -+ <defaultenabled>yes</defaultenabled>
1.189 - </member>
1.190 - <member name="app_sayunixtime" displayname="Say time" remove_on_change="apps/app_sayunixtime.o apps/app_sayunixtime.so">
1.191 - </member>
1.192 -Index: build_tools/cflags.xml
1.193 -diff -Nau build_tools/cflags.xml.orig build_tools/cflags.xml
1.194 ---- build_tools/cflags.xml.orig 2010-02-16 16:36:53.000000000 +0100
1.195 -+++ build_tools/cflags.xml 2011-05-23 17:35:28.348531751 +0200
1.196 -@@ -26,10 +26,11 @@
1.197 - <member name="RADIO_RELAX" displayname="Relax DTMF for Radio Applications">
1.198 - </member>
1.199 - <member name="G711_NEW_ALGORITHM" displayname="Use the NEW ulaw/alaw codecs (slower, but cleaner)">
1.200 -- <defaultenabled>no</defaultenabled>
1.201 -+ <defaultenabled>yes</defaultenabled>
1.202 - </member>
1.203 - <member name="G711_REDUCED_BRANCHING" displayname="New ulaw/alaw codec, reduced branching (might help it run faster in some architectures)">
1.204 - <depend>G711_NEW_ALGORITHM</depend>
1.205 -+ <defaultenabled>yes</defaultenabled>
1.206 - </member>
1.207 - <member name="TEST_CODING_TABLES" displayname="New ulaw/alaw codec, turn on table tests on init">
1.208 - <depend>G711_NEW_ALGORITHM</depend>
1.209 -Index: chan_capi-1.1.5.919/chan_capi20.h
1.210 -diff -Nau chan_capi-1.1.5.919/chan_capi20.h.orig chan_capi-1.1.5.919/chan_capi20.h
1.211 ---- chan_capi-1.1.5.919/chan_capi20.h.orig 2011-01-07 02:29:32.000000000 +0100
1.212 -+++ chan_capi-1.1.5.919/chan_capi20.h 2011-05-23 17:35:28.348531751 +0200
1.213 +Index: cdr/cdr_radius.c
1.214 +diff -Nau cdr/cdr_radius.c.orig cdr/cdr_radius.c
1.215 +--- cdr/cdr_radius.c.orig 2011-07-14 22:13:06.000000000 +0200
1.216 ++++ cdr/cdr_radius.c 2011-09-14 14:29:50.777958246 +0200
1.217 +@@ -106,10 +106,18 @@
1.218 + if (!rc_avpair_add(rh, tosend, PW_AST_SRC, &cdr->src, strlen(cdr->src), VENDOR_CODE))
1.219 + return -1;
1.220 +
1.221 ++ /* RADIUS standard identifier patch */
1.222 ++ if (!rc_avpair_add(rh, tosend, PW_CALLING_STATION_ID, &cdr->src, strlen(cdr->src), 0))
1.223 ++ return -1;
1.224 ++
1.225 + /* Destination */
1.226 + if (!rc_avpair_add(rh, tosend, PW_AST_DST, &cdr->dst, strlen(cdr->dst), VENDOR_CODE))
1.227 + return -1;
1.228 +
1.229 ++ /* RADIUS standard identifier patch */
1.230 ++ if (!rc_avpair_add(rh, tosend, PW_CALLED_STATION_ID, &cdr->dst, strlen(cdr->dst), 0))
1.231 ++ return -1;
1.232 ++
1.233 + /* Destination context */
1.234 + if (!rc_avpair_add(rh, tosend, PW_AST_DST_CTX, &cdr->dcontext, strlen(cdr->dcontext), VENDOR_CODE))
1.235 + return -1;
1.236 +@@ -164,6 +172,10 @@
1.237 + if (!rc_avpair_add(rh, tosend, PW_AST_BILL_SEC, &cdr->billsec, 0, VENDOR_CODE))
1.238 + return -1;
1.239 +
1.240 ++ /* RADIUS standard identifier patch */
1.241 ++ if (!rc_avpair_add(rh, tosend, PW_ACCT_SESSION_TIME, &cdr->billsec, 0, 0))
1.242 ++ return -1;
1.243 ++
1.244 + /* Disposition */
1.245 + tmp = ast_cdr_disp2str(cdr->disposition);
1.246 + if (!rc_avpair_add(rh, tosend, PW_AST_DISPOSITION, tmp, strlen(tmp), VENDOR_CODE))
1.247 +@@ -187,10 +199,14 @@
1.248 + }
1.249 +
1.250 + /* Setting Acct-Session-Id & User-Name attributes for proper generation
1.251 +- of Acct-Unique-Session-Id on server side */
1.252 +- /* Channel */
1.253 +- if (!rc_avpair_add(rh, tosend, PW_USER_NAME, &cdr->channel, strlen(cdr->channel), 0))
1.254 +- return -1;
1.255 ++ of Acct-Unique-Session-Id on server side Channel */
1.256 ++ {
1.257 ++ char szChanuser[PATH_MAX] = {0};
1.258 ++ strncpy(szChanuser, &cdr->channel, PATH_MAX-1);
1.259 ++ *(strrchr(szChanuser, '-')) = 0;
1.260 ++ if (!rc_avpair_add(rh, tosend, PW_USER_NAME, szChanuser, strlen(cdr->channel), 0))
1.261 ++ return -1;
1.262 ++ }
1.263 +
1.264 + /* Unique ID */
1.265 + if (!rc_avpair_add(rh, tosend, PW_ACCT_SESSION_ID, &cdr->uniqueid, strlen(cdr->uniqueid), 0))
1.266 +Index: chan_capi-1.1.5.20110914/chan_capi20.h
1.267 +diff -Nau chan_capi-1.1.5.20110914/chan_capi20.h.orig chan_capi-1.1.5.20110914/chan_capi20.h
1.268 +--- chan_capi-1.1.5.20110914/chan_capi20.h.orig 2011-01-07 02:29:32.000000000 +0100
1.269 ++++ chan_capi-1.1.5.20110914/chan_capi20.h 2011-05-23 17:35:28.348531751 +0200
1.270 @@ -4,10 +4,13 @@
1.271 * first. Else the checks below will fail.
1.272 */
1.273 @@ -396,11 +406,11 @@
1.274 #ifndef HEADER_CID
1.275 #define HEADER_CID(x) ((x)->adr.adrNCCI)
1.276 #endif
1.277 -Index: chan_capi-1.1.5.919/chan_capi_utils.c
1.278 -diff -Nau chan_capi-1.1.5.919/chan_capi_utils.c.orig chan_capi-1.1.5.919/chan_capi_utils.c
1.279 ---- chan_capi-1.1.5.919/chan_capi_utils.c.orig 2011-01-07 02:29:32.000000000 +0100
1.280 -+++ chan_capi-1.1.5.919/chan_capi_utils.c 2011-05-23 17:35:28.348531751 +0200
1.281 -@@ -1155,6 +1155,9 @@
1.282 +Index: chan_capi-1.1.5.20110914/chan_capi_utils.c
1.283 +diff -Nau chan_capi-1.1.5.20110914/chan_capi_utils.c.orig chan_capi-1.1.5.20110914/chan_capi_utils.c
1.284 +--- chan_capi-1.1.5.20110914/chan_capi_utils.c.orig 2011-01-07 02:29:32.000000000 +0100
1.285 ++++ chan_capi-1.1.5.20110914/chan_capi_utils.c 2011-05-23 17:35:28.348531751 +0200
1.286 +@@ -1158,6 +1158,9 @@
1.287 {
1.288 MESSAGE_EXCHANGE_ERROR error;
1.289 int waitcount = 50;
1.290 @@ -410,10 +420,10 @@
1.291 unsigned char manbuf[CAPI_MANUFACTURER_LEN];
1.292 _cmsg CMSG;
1.293
1.294 -Index: chan_capi-1.1.5.919/libcapi20/capi20.c
1.295 -diff -Nau chan_capi-1.1.5.919/libcapi20/capi20.c.orig chan_capi-1.1.5.919/libcapi20/capi20.c
1.296 ---- chan_capi-1.1.5.919/libcapi20/capi20.c.orig 2011-01-07 02:29:31.000000000 +0100
1.297 -+++ chan_capi-1.1.5.919/libcapi20/capi20.c 2011-05-23 17:35:28.348531751 +0200
1.298 +Index: chan_capi-1.1.5.20110914/libcapi20/capi20.c
1.299 +diff -Nau chan_capi-1.1.5.20110914/libcapi20/capi20.c.orig chan_capi-1.1.5.20110914/libcapi20/capi20.c
1.300 +--- chan_capi-1.1.5.20110914/libcapi20/capi20.c.orig 2011-01-07 02:29:31.000000000 +0100
1.301 ++++ chan_capi-1.1.5.20110914/libcapi20/capi20.c 2011-05-23 17:35:28.348531751 +0200
1.302 @@ -19,8 +19,10 @@
1.303 #include <stdio.h>
1.304 #include <ctype.h>
1.305 @@ -707,10 +717,10 @@
1.306 }
1.307 /*
1.308 * functions added to the CAPI2.0 spec
1.309 -Index: chan_capi-1.1.5.919/libcapi20/convert.c
1.310 -diff -Nau chan_capi-1.1.5.919/libcapi20/convert.c.orig chan_capi-1.1.5.919/libcapi20/convert.c
1.311 ---- chan_capi-1.1.5.919/libcapi20/convert.c.orig 2011-01-07 02:29:31.000000000 +0100
1.312 -+++ chan_capi-1.1.5.919/libcapi20/convert.c 2011-05-23 17:35:28.348531751 +0200
1.313 +Index: chan_capi-1.1.5.20110914/libcapi20/convert.c
1.314 +diff -Nau chan_capi-1.1.5.20110914/libcapi20/convert.c.orig chan_capi-1.1.5.20110914/libcapi20/convert.c
1.315 +--- chan_capi-1.1.5.20110914/libcapi20/convert.c.orig 2011-01-07 02:29:31.000000000 +0100
1.316 ++++ chan_capi-1.1.5.20110914/libcapi20/convert.c 2011-05-23 17:35:28.348531751 +0200
1.317 @@ -11,7 +11,14 @@
1.318 #include <stddef.h>
1.319 #include <time.h>
1.320 @@ -726,11 +736,11 @@
1.321
1.322 #include "capi20.h"
1.323
1.324 -Index: chan_capi-1.1.5.919/Makefile
1.325 -diff -Nau chan_capi-1.1.5.919/Makefile.orig chan_capi-1.1.5.919/Makefile
1.326 ---- chan_capi-1.1.5.919/Makefile.orig 2011-01-07 02:29:32.000000000 +0100
1.327 -+++ chan_capi-1.1.5.919/Makefile 2011-05-23 17:35:28.348531751 +0200
1.328 -@@ -111,6 +111,9 @@
1.329 +Index: chan_capi-1.1.5.20110914/Makefile
1.330 +diff -Nau chan_capi-1.1.5.20110914/Makefile.orig chan_capi-1.1.5.20110914/Makefile
1.331 +--- chan_capi-1.1.5.20110914/Makefile.orig 2011-01-07 02:29:32.000000000 +0100
1.332 ++++ chan_capi-1.1.5.20110914/Makefile 2011-05-23 17:35:28.348531751 +0200
1.333 +@@ -114,6 +114,9 @@
1.334 CFLAGS+=-O2
1.335 CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
1.336 CFLAGS+=$(shell if uname -m | grep -q "ppc\|arm\|s390"; then echo "-fsigned-char"; fi)
1.337 @@ -742,9 +752,9 @@
1.338 endif
1.339 Index: channels/chan_sip.c
1.340 diff -Nau channels/chan_sip.c.orig channels/chan_sip.c
1.341 ---- channels/chan_sip.c.orig 2011-04-25 17:11:30.000000000 +0200
1.342 -+++ channels/chan_sip.c 2011-05-23 17:35:28.358543497 +0200
1.343 -@@ -11458,7 +11458,16 @@
1.344 +--- channels/chan_sip.c.orig 2011-08-10 00:12:59.000000000 +0200
1.345 ++++ channels/chan_sip.c 2011-09-14 14:29:50.757959000 +0200
1.346 +@@ -11647,7 +11647,16 @@
1.347 } else {
1.348 if (sipmethod == SIP_NOTIFY && !ast_strlen_zero(p->theirtag)) {
1.349 /* If this is a NOTIFY, use the From: tag in the subscribe (RFC 3265) */
1.350 @@ -765,7 +775,7 @@
1.351 Index: channels/console_video.h
1.352 diff -Nau channels/console_video.h.orig channels/console_video.h
1.353 --- channels/console_video.h.orig 2008-06-30 17:45:15.000000000 +0200
1.354 -+++ channels/console_video.h 2011-05-23 17:35:28.358543497 +0200
1.355 ++++ channels/console_video.h 2011-09-14 14:29:50.767970949 +0200
1.356 @@ -28,10 +28,7 @@
1.357 "console {device}"
1.358 #else
1.359 @@ -780,8 +790,8 @@
1.360 "console {videodevice|videocodec" \
1.361 Index: configure
1.362 diff -Nau configure.orig configure
1.363 ---- configure.orig 2011-01-27 18:03:01.000000000 +0100
1.364 -+++ configure 2011-05-23 17:41:08.331029717 +0200
1.365 +--- configure.orig 2011-08-25 21:08:04.000000000 +0200
1.366 ++++ configure 2011-09-14 14:29:50.767970949 +0200
1.367 @@ -4704,11 +4704,6 @@
1.368 esac
1.369
1.370 @@ -794,7 +804,7 @@
1.371 openbsd*)
1.372 ac_default_prefix=/usr/local
1.373 if test ${prefix} = '/usr/local' || test ${prefix} = 'NONE'; then
1.374 -@@ -18203,8 +18198,8 @@
1.375 +@@ -18308,8 +18303,8 @@
1.376 if test -f "${IMAP_TK_DIR}/c-client/LDFLAGS"; then
1.377 imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
1.378 fi
1.379 @@ -805,7 +815,7 @@
1.380 CPPFLAGS="${CPPFLAGS} ${imap_include}"
1.381 LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}`
1.382 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.383 -@@ -25436,19 +25431,19 @@
1.384 +@@ -25541,19 +25536,19 @@
1.385
1.386 # now check for the header.
1.387 if test "${AST_LUA_FOUND}" = "yes"; then
1.388 @@ -829,7 +839,7 @@
1.389 LUA_HEADER_FOUND=1
1.390 else
1.391 LUA_HEADER_FOUND=0
1.392 -@@ -25476,9 +25471,9 @@
1.393 +@@ -25581,9 +25576,9 @@
1.394
1.395 if test "x${PBX_LUA}" = "x1" ; then
1.396 if test x"${LUA_DIR}" = x; then
1.397 @@ -841,7 +851,7 @@
1.398 fi
1.399 fi
1.400
1.401 -@@ -26157,7 +26152,7 @@
1.402 +@@ -26262,7 +26257,7 @@
1.403 pbxlibdir="-L${SQLITE_DIR}"
1.404 fi
1.405 fi
1.406 @@ -850,7 +860,7 @@
1.407 if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
1.408 AST_SQLITE_FOUND=yes
1.409 else
1.410 -@@ -26867,16 +26862,16 @@
1.411 +@@ -26976,16 +26971,16 @@
1.412 if test "x${PBX_GMIME}" != "x1" -a "${USE_GMIME}" != "no"; then
1.413 PBX_GMIME=0
1.414 if test -n "$ac_tool_prefix"; then
1.415 @@ -872,7 +882,7 @@
1.416 ;;
1.417 *)
1.418 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.419 -@@ -26887,7 +26882,7 @@
1.420 +@@ -26996,7 +26991,7 @@
1.421 test -z "$as_dir" && as_dir=.
1.422 for ac_exec_ext in '' $ac_executable_extensions; do
1.423 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.424 @@ -881,7 +891,7 @@
1.425 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.426 break 2
1.427 fi
1.428 -@@ -26898,10 +26893,10 @@
1.429 +@@ -27007,10 +27002,10 @@
1.430 ;;
1.431 esac
1.432 fi
1.433 @@ -896,7 +906,7 @@
1.434 else
1.435 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.436 $as_echo "no" >&6; }
1.437 -@@ -26909,18 +26904,18 @@
1.438 +@@ -27018,18 +27013,18 @@
1.439
1.440
1.441 fi
1.442 @@ -922,7 +932,7 @@
1.443 ;;
1.444 *)
1.445 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.446 -@@ -26931,7 +26926,7 @@
1.447 +@@ -27040,7 +27035,7 @@
1.448 test -z "$as_dir" && as_dir=.
1.449 for ac_exec_ext in '' $ac_executable_extensions; do
1.450 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.451 @@ -931,7 +941,7 @@
1.452 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.453 break 2
1.454 fi
1.455 -@@ -26942,17 +26937,17 @@
1.456 +@@ -27051,17 +27046,17 @@
1.457 ;;
1.458 esac
1.459 fi
1.460 @@ -955,7 +965,7 @@
1.461 else
1.462 case $cross_compiling:$ac_tool_warned in
1.463 yes:)
1.464 -@@ -26960,17 +26955,15 @@
1.465 +@@ -27069,17 +27064,15 @@
1.466 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1.467 ac_tool_warned=yes ;;
1.468 esac
1.469 @@ -980,9 +990,9 @@
1.470 if test "x${GMIME_DIR}" != "x"; then
1.471 Index: formats/format_pcm.c
1.472 diff -Nau formats/format_pcm.c.orig formats/format_pcm.c
1.473 ---- formats/format_pcm.c.orig 2010-07-26 05:27:06.000000000 +0200
1.474 -+++ formats/format_pcm.c 2011-05-23 17:35:28.368530778 +0200
1.475 -@@ -350,6 +350,7 @@
1.476 +--- formats/format_pcm.c.orig 2011-07-14 22:13:06.000000000 +0200
1.477 ++++ formats/format_pcm.c 2011-09-14 14:29:50.767970949 +0200
1.478 +@@ -354,6 +354,7 @@
1.479 ast_log(LOG_WARNING, "Unable to write header\n");
1.480 return -1;
1.481 }
1.482 @@ -992,9 +1002,9 @@
1.483
1.484 Index: formats/format_wav.c
1.485 diff -Nau formats/format_wav.c.orig formats/format_wav.c
1.486 ---- formats/format_wav.c.orig 2010-09-02 18:43:09.000000000 +0200
1.487 -+++ formats/format_wav.c 2011-05-23 17:35:28.368530778 +0200
1.488 -@@ -310,6 +310,7 @@
1.489 +--- formats/format_wav.c.orig 2011-07-29 19:18:56.000000000 +0200
1.490 ++++ formats/format_wav.c 2011-09-14 14:29:50.767970949 +0200
1.491 +@@ -308,6 +308,7 @@
1.492 ast_log(LOG_WARNING, "Unable to write header\n");
1.493 return -1;
1.494 }
1.495 @@ -1004,9 +1014,9 @@
1.496
1.497 Index: formats/format_wav_gsm.c
1.498 diff -Nau formats/format_wav_gsm.c.orig formats/format_wav_gsm.c
1.499 ---- formats/format_wav_gsm.c.orig 2010-07-26 05:27:06.000000000 +0200
1.500 -+++ formats/format_wav_gsm.c 2011-05-23 17:35:28.368530778 +0200
1.501 -@@ -362,6 +362,7 @@
1.502 +--- formats/format_wav_gsm.c.orig 2011-07-14 22:13:06.000000000 +0200
1.503 ++++ formats/format_wav_gsm.c 2011-09-14 14:29:50.767970949 +0200
1.504 +@@ -366,6 +366,7 @@
1.505 ast_log(LOG_WARNING, "Unable to write header\n");
1.506 return -1;
1.507 }
1.508 @@ -1017,7 +1027,7 @@
1.509 Index: main/db1-ast/hash/hash.h
1.510 diff -Nau main/db1-ast/hash/hash.h.orig main/db1-ast/hash/hash.h
1.511 --- main/db1-ast/hash/hash.h.orig 2006-08-21 04:11:39.000000000 +0200
1.512 -+++ main/db1-ast/hash/hash.h 2011-05-23 17:35:28.368530778 +0200
1.513 ++++ main/db1-ast/hash/hash.h 2011-09-14 14:29:50.767970949 +0200
1.514 @@ -36,6 +36,8 @@
1.515 * @(#)hash.h 8.3 (Berkeley) 5/31/94
1.516 */
1.517 @@ -1030,7 +1040,7 @@
1.518 Index: main/db1-ast/hash/ndbm.c
1.519 diff -Nau main/db1-ast/hash/ndbm.c.orig main/db1-ast/hash/ndbm.c
1.520 --- main/db1-ast/hash/ndbm.c.orig 2006-08-21 04:11:39.000000000 +0200
1.521 -+++ main/db1-ast/hash/ndbm.c 2011-05-23 17:35:28.368530778 +0200
1.522 ++++ main/db1-ast/hash/ndbm.c 2011-09-14 14:29:50.767970949 +0200
1.523 @@ -49,7 +49,8 @@
1.524 #include <string.h>
1.525 #include <stdlib.h>
1.526 @@ -1043,9 +1053,9 @@
1.527 /*
1.528 Index: main/features.c
1.529 diff -Nau main/features.c.orig main/features.c
1.530 ---- main/features.c.orig 2011-02-09 20:52:51.000000000 +0100
1.531 -+++ main/features.c 2011-05-23 17:35:28.368530778 +0200
1.532 -@@ -1658,6 +1658,10 @@
1.533 +--- main/features.c.orig 2011-08-10 00:12:59.000000000 +0200
1.534 ++++ main/features.c 2011-09-14 14:29:50.777958246 +0200
1.535 +@@ -1646,6 +1646,10 @@
1.536 snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename);
1.537 }
1.538
1.539 @@ -1056,7 +1066,7 @@
1.540 for(x = 0; x < strlen(args); x++) {
1.541 if (args[x] == '/')
1.542 args[x] = '-';
1.543 -@@ -1774,6 +1778,10 @@
1.544 +@@ -1762,6 +1766,10 @@
1.545 snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav"));
1.546 }
1.547
1.548 @@ -1069,9 +1079,9 @@
1.549 args[x] = '-';
1.550 Index: main/file.c
1.551 diff -Nau main/file.c.orig main/file.c
1.552 ---- main/file.c.orig 2011-01-26 02:26:26.000000000 +0100
1.553 -+++ main/file.c 2011-05-23 17:35:28.378531576 +0200
1.554 -@@ -255,7 +255,7 @@
1.555 +--- main/file.c.orig 2011-07-05 15:23:57.000000000 +0200
1.556 ++++ main/file.c 2011-09-14 14:29:50.777958246 +0200
1.557 +@@ -256,7 +256,7 @@
1.558 char *fn = NULL;
1.559
1.560 if (!strcmp(ext, "wav49"))
1.561 @@ -1082,8 +1092,8 @@
1.562 if (asprintf(&fn, "%s.%s", filename, ext) < 0) {
1.563 Index: main/Makefile
1.564 diff -Nau main/Makefile.orig main/Makefile
1.565 ---- main/Makefile.orig 2010-12-18 00:52:04.000000000 +0100
1.566 -+++ main/Makefile 2011-05-23 17:35:28.378531576 +0200
1.567 +--- main/Makefile.orig 2011-08-03 17:14:36.000000000 +0200
1.568 ++++ main/Makefile 2011-09-14 14:29:50.777958246 +0200
1.569 @@ -69,10 +69,7 @@
1.570 endif
1.571
1.572 @@ -1098,9 +1108,9 @@
1.573 ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
1.574 Index: main/tcptls.c
1.575 diff -Nau main/tcptls.c.orig main/tcptls.c
1.576 ---- main/tcptls.c.orig 2011-04-25 17:11:30.000000000 +0200
1.577 -+++ main/tcptls.c 2011-05-23 17:35:28.378531576 +0200
1.578 -@@ -353,6 +353,7 @@
1.579 +--- main/tcptls.c.orig 2011-05-23 18:18:33.000000000 +0200
1.580 ++++ main/tcptls.c 2011-09-14 14:29:50.777958246 +0200
1.581 +@@ -357,6 +357,7 @@
1.582 if (!ast_strlen_zero(cfg->cafile) || !ast_strlen_zero(cfg->capath)) {
1.583 if (SSL_CTX_load_verify_locations(cfg->ssl_ctx, S_OR(cfg->cafile, NULL), S_OR(cfg->capath,NULL)) == 0)
1.584 ast_verb(0, "SSL CA file(%s)/path(%s) error\n", cfg->cafile, cfg->capath);
1.585 @@ -1110,8 +1120,8 @@
1.586 ast_verb(0, "SSL certificate ok\n");
1.587 Index: main/udptl.c
1.588 diff -Nau main/udptl.c.orig main/udptl.c
1.589 ---- main/udptl.c.orig 2011-02-21 16:02:20.000000000 +0100
1.590 -+++ main/udptl.c 2011-05-23 17:35:28.378531576 +0200
1.591 +--- main/udptl.c.orig 2011-05-03 21:55:49.000000000 +0200
1.592 ++++ main/udptl.c 2011-09-14 14:29:50.777958246 +0200
1.593 @@ -98,6 +98,18 @@
1.594
1.595 #define UDPTL_BUF_MASK 15
1.596 @@ -1133,8 +1143,8 @@
1.597 uint8_t buf[LOCAL_FAX_MAX_DATAGRAM];
1.598 Index: Makefile
1.599 diff -Nau Makefile.orig Makefile
1.600 ---- Makefile.orig 2011-02-01 19:02:06.000000000 +0100
1.601 -+++ Makefile 2011-05-23 17:35:28.378531576 +0200
1.602 +--- Makefile.orig 2011-08-25 21:08:04.000000000 +0200
1.603 ++++ Makefile 2011-09-14 14:29:50.777958246 +0200
1.604 @@ -230,15 +230,6 @@
1.605 _ASTCFLAGS+=-fsigned-char
1.606 endif
1.607 @@ -1151,168 +1161,3 @@
1.608 ifeq ($(OSARCH),NetBSD)
1.609 _ASTCFLAGS+=-pthread -I/usr/pkg/include
1.610 endif
1.611 -Index: menuselect-tree
1.612 -diff -Nau menuselect-tree.orig menuselect-tree
1.613 ---- menuselect-tree.orig 2011-05-09 22:22:55.000000000 +0200
1.614 -+++ menuselect-tree 2011-05-23 17:35:28.378531576 +0200
1.615 -@@ -38,6 +38,8 @@
1.616 - </member>
1.617 - <member name="app_authenticate" displayname="Authentication Application" remove_on_change="apps/app_authenticate.o apps/app_authenticate.so">
1.618 - </member>
1.619 -+<member name="app_backticks" displayname="BACKTICKS() dialplan function" remove_on_change="apps/app_backticks.o apps/app_backticks.so">
1.620 -+</member>
1.621 - <member name="app_cdr" displayname="Tell Asterisk to not maintain a CDR for the current call" remove_on_change="apps/app_cdr.o apps/app_cdr.so">
1.622 - </member>
1.623 - <member name="app_celgenuserevent" displayname="Generate an User-Defined CEL event" remove_on_change="apps/app_celgenuserevent.o apps/app_celgenuserevent.so">
1.624 -@@ -937,11 +939,11 @@
1.625 - <member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law format">
1.626 - </member>
1.627 - <member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM format" >
1.628 -- <defaultenabled>yes</defaultenabled>
1.629 - </member>
1.630 - <member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 format">
1.631 - </member>
1.632 - <member name="CORE-SOUNDS-EN-G722" displayname="English, G.722 format">
1.633 -+ <defaultenabled>yes</defaultenabled>
1.634 - </member>
1.635 - <member name="CORE-SOUNDS-EN-SLN16" displayname="English, Signed-linear 16kHz format">
1.636 - </member>
1.637 -@@ -1006,7 +1008,6 @@
1.638 - </category>
1.639 - <category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes">
1.640 - <member name="MOH-OPSOUND-WAV" displayname="opsound.org Music On Hold Files, WAV format" >
1.641 -- <defaultenabled>yes</defaultenabled>
1.642 - </member>
1.643 - <member name="MOH-OPSOUND-ULAW" displayname="opsound.org Music On Hold Files, mu-Law format" >
1.644 - </member>
1.645 -@@ -1017,6 +1018,7 @@
1.646 - <member name="MOH-OPSOUND-G729" displayname="opsound.org Music On Hold Files, G.729 format" >
1.647 - </member>
1.648 - <member name="MOH-OPSOUND-G722" displayname="opsound.org Music On Hold Files, G.722 format" >
1.649 -+ <defaultenabled>yes</defaultenabled>
1.650 - </member>
1.651 - <member name="MOH-OPSOUND-SLN16" displayname="opsound.org Music On Hold Files, Signed-linear 16kHz format" >
1.652 - </member>
1.653 -@@ -1037,6 +1039,7 @@
1.654 - <member name="EXTRA-SOUNDS-EN-G729" displayname="English, G.729 format">
1.655 - </member>
1.656 - <member name="EXTRA-SOUNDS-EN-G722" displayname="English, G.722 format">
1.657 -+ <defaultenabled>yes</defaultenabled>
1.658 - </member>
1.659 - <member name="EXTRA-SOUNDS-EN-SLN16" displayname="English, Signed-linear 16kHz format">
1.660 - </member>
1.661 -Index: res/res_http_post.c
1.662 -diff -Nau res/res_http_post.c.orig res/res_http_post.c
1.663 ---- res/res_http_post.c.orig 2009-10-27 17:48:54.000000000 +0100
1.664 -+++ res/res_http_post.c 2011-05-23 17:35:28.378531576 +0200
1.665 -@@ -122,14 +122,8 @@
1.666 - ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MESSAGE_PARTIAL\n");
1.667 - return;
1.668 - } else if (GMIME_IS_MULTIPART(part)) {
1.669 -- GList *l;
1.670 --
1.671 -- ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MULTIPART, trying to process subparts\n");
1.672 -- l = GMIME_MULTIPART(part)->subparts;
1.673 -- while (l) {
1.674 -- process_message_callback(l->data, cbinfo);
1.675 -- l = l->next;
1.676 -- }
1.677 -+ ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MULTIPART, trying to process subparts\n");
1.678 -+ g_mime_multipart_foreach(GMIME_MULTIPART(part), process_message_callback, cbinfo);
1.679 - } else if (GMIME_IS_PART(part)) {
1.680 - const char *filename;
1.681 -
1.682 -Index: sounds/sounds.xml
1.683 -diff -Nau sounds/sounds.xml.orig sounds/sounds.xml
1.684 ---- sounds/sounds.xml.orig 2010-10-18 23:51:23.000000000 +0200
1.685 -+++ sounds/sounds.xml 2011-05-23 17:35:28.378531576 +0200
1.686 -@@ -6,11 +6,11 @@
1.687 - <member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law format">
1.688 - </member>
1.689 - <member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM format" >
1.690 -- <defaultenabled>yes</defaultenabled>
1.691 - </member>
1.692 - <member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 format">
1.693 - </member>
1.694 - <member name="CORE-SOUNDS-EN-G722" displayname="English, G.722 format">
1.695 -+ <defaultenabled>yes</defaultenabled>
1.696 - </member>
1.697 - <member name="CORE-SOUNDS-EN-SLN16" displayname="English, Signed-linear 16kHz format">
1.698 - </member>
1.699 -@@ -75,7 +75,6 @@
1.700 - </category>
1.701 - <category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes">
1.702 - <member name="MOH-OPSOUND-WAV" displayname="opsound.org Music On Hold Files, WAV format" >
1.703 -- <defaultenabled>yes</defaultenabled>
1.704 - </member>
1.705 - <member name="MOH-OPSOUND-ULAW" displayname="opsound.org Music On Hold Files, mu-Law format" >
1.706 - </member>
1.707 -@@ -86,6 +85,7 @@
1.708 - <member name="MOH-OPSOUND-G729" displayname="opsound.org Music On Hold Files, G.729 format" >
1.709 - </member>
1.710 - <member name="MOH-OPSOUND-G722" displayname="opsound.org Music On Hold Files, G.722 format" >
1.711 -+ <defaultenabled>yes</defaultenabled>
1.712 - </member>
1.713 - <member name="MOH-OPSOUND-SLN16" displayname="opsound.org Music On Hold Files, Signed-linear 16kHz format" >
1.714 - </member>
1.715 -@@ -106,6 +106,7 @@
1.716 - <member name="EXTRA-SOUNDS-EN-G729" displayname="English, G.729 format">
1.717 - </member>
1.718 - <member name="EXTRA-SOUNDS-EN-G722" displayname="English, G.722 format">
1.719 -+ <defaultenabled>yes</defaultenabled>
1.720 - </member>
1.721 - <member name="EXTRA-SOUNDS-EN-SLN16" displayname="English, Signed-linear 16kHz format">
1.722 - </member>
1.723 -Index: cdr/cdr_radius.c
1.724 -diff -Nau cdr/cdr_radius.c.orig cdr/cdr_radius.c
1.725 ---- cdr/cdr_radius.c.orig 2010-07-20 21:35:02.000000000 +0200
1.726 -+++ cdr/cdr_radius.c 2011-05-23 17:35:28.378531576 +0200
1.727 -@@ -105,10 +105,18 @@
1.728 - if (!rc_avpair_add(rh, tosend, PW_AST_SRC, &cdr->src, strlen(cdr->src), VENDOR_CODE))
1.729 - return -1;
1.730 -
1.731 -+ /* RADIUS standard identifier patch */
1.732 -+ if (!rc_avpair_add(rh, tosend, PW_CALLING_STATION_ID, &cdr->src, strlen(cdr->src), 0))
1.733 -+ return -1;
1.734 -+
1.735 - /* Destination */
1.736 - if (!rc_avpair_add(rh, tosend, PW_AST_DST, &cdr->dst, strlen(cdr->dst), VENDOR_CODE))
1.737 - return -1;
1.738 -
1.739 -+ /* RADIUS standard identifier patch */
1.740 -+ if (!rc_avpair_add(rh, tosend, PW_CALLED_STATION_ID, &cdr->dst, strlen(cdr->dst), 0))
1.741 -+ return -1;
1.742 -+
1.743 - /* Destination context */
1.744 - if (!rc_avpair_add(rh, tosend, PW_AST_DST_CTX, &cdr->dcontext, strlen(cdr->dcontext), VENDOR_CODE))
1.745 - return -1;
1.746 -@@ -163,6 +171,10 @@
1.747 - if (!rc_avpair_add(rh, tosend, PW_AST_BILL_SEC, &cdr->billsec, 0, VENDOR_CODE))
1.748 - return -1;
1.749 -
1.750 -+ /* RADIUS standard identifier patch */
1.751 -+ if (!rc_avpair_add(rh, tosend, PW_ACCT_SESSION_TIME, &cdr->billsec, 0, 0))
1.752 -+ return -1;
1.753 -+
1.754 - /* Disposition */
1.755 - tmp = ast_cdr_disp2str(cdr->disposition);
1.756 - if (!rc_avpair_add(rh, tosend, PW_AST_DISPOSITION, tmp, strlen(tmp), VENDOR_CODE))
1.757 -@@ -186,10 +198,14 @@
1.758 - }
1.759 -
1.760 - /* Setting Acct-Session-Id & User-Name attributes for proper generation
1.761 -- of Acct-Unique-Session-Id on server side */
1.762 -- /* Channel */
1.763 -- if (!rc_avpair_add(rh, tosend, PW_USER_NAME, &cdr->channel, strlen(cdr->channel), 0))
1.764 -- return -1;
1.765 -+ of Acct-Unique-Session-Id on server side Channel */
1.766 -+ {
1.767 -+ char szChanuser[PATH_MAX] = {0};
1.768 -+ strncpy(szChanuser, &cdr->channel, PATH_MAX-1);
1.769 -+ *(strrchr(szChanuser, '-')) = 0;
1.770 -+ if (!rc_avpair_add(rh, tosend, PW_USER_NAME, szChanuser, strlen(cdr->channel), 0))
1.771 -+ return -1;
1.772 -+ }
1.773 -
1.774 - /* Unique ID */
1.775 - if (!rc_avpair_add(rh, tosend, PW_ACCT_SESSION_ID, &cdr->uniqueid, strlen(cdr->uniqueid), 0))
