mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
Issue #5980: Removing extra CR+LF in manager events - needs port to trunk
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@7795 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -361,7 +361,7 @@ int ast_park_call(struct ast_channel *chan, struct ast_channel *peer, int timeou
|
|||||||
"From: %s\r\n"
|
"From: %s\r\n"
|
||||||
"Timeout: %ld\r\n"
|
"Timeout: %ld\r\n"
|
||||||
"CallerID: %s\r\n"
|
"CallerID: %s\r\n"
|
||||||
"CallerIDName: %s\r\n\r\n"
|
"CallerIDName: %s\r\n"
|
||||||
,pu->parkingnum, pu->chan->name, peer->name
|
,pu->parkingnum, pu->chan->name, peer->name
|
||||||
,(long)pu->start.tv_sec + (long)(pu->parkingtime/1000) - (long)time(NULL)
|
,(long)pu->start.tv_sec + (long)(pu->parkingtime/1000) - (long)time(NULL)
|
||||||
,(pu->chan->cid.cid_num ? pu->chan->cid.cid_num : "<unknown>")
|
,(pu->chan->cid.cid_num ? pu->chan->cid.cid_num : "<unknown>")
|
||||||
@@ -1533,7 +1533,7 @@ static void *do_parking_thread(void *ignore)
|
|||||||
"Exten: %d\r\n"
|
"Exten: %d\r\n"
|
||||||
"Channel: %s\r\n"
|
"Channel: %s\r\n"
|
||||||
"CallerID: %s\r\n"
|
"CallerID: %s\r\n"
|
||||||
"CallerIDName: %s\r\n\r\n"
|
"CallerIDName: %s\r\n"
|
||||||
,pu->parkingnum, pu->chan->name
|
,pu->parkingnum, pu->chan->name
|
||||||
,(pu->chan->cid.cid_num ? pu->chan->cid.cid_num : "<unknown>")
|
,(pu->chan->cid.cid_num ? pu->chan->cid.cid_num : "<unknown>")
|
||||||
,(pu->chan->cid.cid_name ? pu->chan->cid.cid_name : "<unknown>")
|
,(pu->chan->cid.cid_name ? pu->chan->cid.cid_name : "<unknown>")
|
||||||
@@ -1577,7 +1577,7 @@ static void *do_parking_thread(void *ignore)
|
|||||||
"Exten: %d\r\n"
|
"Exten: %d\r\n"
|
||||||
"Channel: %s\r\n"
|
"Channel: %s\r\n"
|
||||||
"CallerID: %s\r\n"
|
"CallerID: %s\r\n"
|
||||||
"CallerIDName: %s\r\n\r\n"
|
"CallerIDName: %s\r\n"
|
||||||
,pu->parkingnum, pu->chan->name
|
,pu->parkingnum, pu->chan->name
|
||||||
,(pu->chan->cid.cid_num ? pu->chan->cid.cid_num : "<unknown>")
|
,(pu->chan->cid.cid_num ? pu->chan->cid.cid_num : "<unknown>")
|
||||||
,(pu->chan->cid.cid_name ? pu->chan->cid.cid_name : "<unknown>")
|
,(pu->chan->cid.cid_name ? pu->chan->cid.cid_name : "<unknown>")
|
||||||
@@ -1714,7 +1714,7 @@ static int park_exec(struct ast_channel *chan, void *data)
|
|||||||
"Channel: %s\r\n"
|
"Channel: %s\r\n"
|
||||||
"From: %s\r\n"
|
"From: %s\r\n"
|
||||||
"CallerID: %s\r\n"
|
"CallerID: %s\r\n"
|
||||||
"CallerIDName: %s\r\n\r\n"
|
"CallerIDName: %s\r\n"
|
||||||
,pu->parkingnum, pu->chan->name, chan->name
|
,pu->parkingnum, pu->chan->name, chan->name
|
||||||
,(pu->chan->cid.cid_num ? pu->chan->cid.cid_num : "<unknown>")
|
,(pu->chan->cid.cid_num ? pu->chan->cid.cid_num : "<unknown>")
|
||||||
,(pu->chan->cid.cid_name ? pu->chan->cid.cid_name : "<unknown>")
|
,(pu->chan->cid.cid_name ? pu->chan->cid.cid_name : "<unknown>")
|
||||||
|
Reference in New Issue
Block a user