comparison: asterisk/asterisk.patch
asterisk/asterisk.patch
- changeset 315
- 75d162df42e8
- parent 311
- 263143ec0fb2
- child 316
- 153998c81c45
equal
deleted
inserted
replaced
| 2:108e5688ba0c | 3:66deb7a0d697 |
|---|---|
| 1280 <member name="EXTRA-SOUNDS-EN-G722" displayname="English, G.722 format"> | 1280 <member name="EXTRA-SOUNDS-EN-G722" displayname="English, G.722 format"> |
| 1281 + <defaultenabled>yes</defaultenabled> | 1281 + <defaultenabled>yes</defaultenabled> |
| 1282 </member> | 1282 </member> |
| 1283 <member name="EXTRA-SOUNDS-EN-SLN16" displayname="English, Signed-linear 16kHz format"> | 1283 <member name="EXTRA-SOUNDS-EN-SLN16" displayname="English, Signed-linear 16kHz format"> |
| 1284 </member> | 1284 </member> |
| 1285 Index: cdr/cdr_radius.c | |
| 1286 diff -Nau cdr/cdr_radius.c.orig cdr/cdr_radius.c | |
| 1287 --- cdr/cdr_radius.c.orig 2010-07-20 21:35:02.000000000 +0200 | |
| 1288 +++ cdr/cdr_radius.c 2011-03-22 16:12:11.000000000 +0100 | |
| 1289 @@ -105,10 +105,18 @@ | |
| 1290 if (!rc_avpair_add(rh, tosend, PW_AST_SRC, &cdr->src, strlen(cdr->src), VENDOR_CODE)) | |
| 1291 return -1; | |
| 1292 | |
| 1293 + /* RADIUS standard identifier patch */ | |
| 1294 + if (!rc_avpair_add(rh, tosend, PW_CALLING_STATION_ID, &cdr->src, strlen(cdr->src), 0)) | |
| 1295 + return -1; | |
| 1296 + | |
| 1297 /* Destination */ | |
| 1298 if (!rc_avpair_add(rh, tosend, PW_AST_DST, &cdr->dst, strlen(cdr->dst), VENDOR_CODE)) | |
| 1299 return -1; | |
| 1300 | |
| 1301 + /* RADIUS standard identifier patch */ | |
| 1302 + if (!rc_avpair_add(rh, tosend, PW_CALLED_STATION_ID, &cdr->dst, strlen(cdr->dst), 0)) | |
| 1303 + return -1; | |
| 1304 + | |
| 1305 /* Destination context */ | |
| 1306 if (!rc_avpair_add(rh, tosend, PW_AST_DST_CTX, &cdr->dcontext, strlen(cdr->dcontext), VENDOR_CODE)) | |
| 1307 return -1; | |
| 1308 @@ -163,6 +171,10 @@ | |
| 1309 if (!rc_avpair_add(rh, tosend, PW_AST_BILL_SEC, &cdr->billsec, 0, VENDOR_CODE)) | |
| 1310 return -1; | |
| 1311 | |
| 1312 + /* RADIUS standard identifier patch */ | |
| 1313 + if (!rc_avpair_add(rh, tosend, PW_ACCT_SESSION_TIME, &cdr->billsec, 0, 0)) | |
| 1314 + return -1; | |
| 1315 + | |
| 1316 /* Disposition */ | |
| 1317 tmp = ast_cdr_disp2str(cdr->disposition); | |
| 1318 if (!rc_avpair_add(rh, tosend, PW_AST_DISPOSITION, tmp, strlen(tmp), VENDOR_CODE)) | |
| 1319 @@ -186,10 +198,14 @@ | |
| 1320 } | |
| 1321 | |
| 1322 /* Setting Acct-Session-Id & User-Name attributes for proper generation | |
| 1323 - of Acct-Unique-Session-Id on server side */ | |
| 1324 - /* Channel */ | |
| 1325 - if (!rc_avpair_add(rh, tosend, PW_USER_NAME, &cdr->channel, strlen(cdr->channel), 0)) | |
| 1326 - return -1; | |
| 1327 + of Acct-Unique-Session-Id on server side Channel */ | |
| 1328 + { | |
| 1329 + char szChanuser[NAME_MAX] = {0}; | |
| 1330 + strncpy(szChanuser, &cdr->channel, NAME_MAX-1); | |
| 1331 + *(strrchr(szChanuser, '-')) = 0; | |
| 1332 + if (!rc_avpair_add(rh, tosend, PW_USER_NAME, szChanuser, strlen(cdr->channel), 0)) | |
| 1333 + return -1; | |
| 1334 + } | |
| 1335 | |
| 1336 /* Unique ID */ | |
| 1337 if (!rc_avpair_add(rh, tosend, PW_ACCT_SESSION_ID, &cdr->uniqueid, strlen(cdr->uniqueid), 0)) |
