Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix receiving message count information from a remote IAX2 peer. (issue #7163 reported by and fixed by akohlsmith)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@28017 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.4
Joshua Colp 20 years ago
parent e08dc08ae2
commit 5769ed6ea2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

12
channels/chan_iax2.c
Unescape View File

@ -412,7 +412,7 @@ struct iax2_registry {
int expire; /*!< Sched ID of expiration */ int expire; /*!< Sched ID of expiration */
int refresh; /*!< How often to refresh */ int refresh; /*!< How often to refresh */
enum iax_reg_state regstate; enum iax_reg_state regstate;
int messages; /*!< Message count */ int messages; /*!< Message count, low 8 bits = new, high 8 bits = old */
int callno; /*!< Associated call number if applicable */ int callno; /*!< Associated call number if applicable */
struct sockaddr_in us; /*!< Who the server thinks we are */ struct sockaddr_in us; /*!< Who the server thinks we are */
struct iax2_registry *next; struct iax2_registry *next;
@ -5410,7 +5410,7 @@ static int iax2_ack_registry(struct iax_ies *ies, struct sockaddr_in *sin, int c
return -1; return -1;
} }
memcpy(&reg->us, &us, sizeof(reg->us)); memcpy(&reg->us, &us, sizeof(reg->us));
reg->messages = ies->msgcount; reg->messages = ies->msgcount & 0xffff; /* only low 16 bits are used in the transmission of the IE */
/* always refresh the registration at the interval requested by the server /* always refresh the registration at the interval requested by the server
we are registering to we are registering to
*/ */
@ -5420,12 +5420,12 @@ static int iax2_ack_registry(struct iax_ies *ies, struct sockaddr_in *sin, int c
reg->expire = ast_sched_add(sched, (5 * reg->refresh / 6) * 1000, iax2_do_register_s, reg); reg->expire = ast_sched_add(sched, (5 * reg->refresh / 6) * 1000, iax2_do_register_s, reg);
if (inaddrcmp(&oldus, &reg->us) || (reg->messages != oldmsgs)) { if (inaddrcmp(&oldus, &reg->us) || (reg->messages != oldmsgs)) {
if (option_verbose > 2) { if (option_verbose > 2) {
if (reg->messages > 65534) if (reg->messages > 255)
snprintf(msgstatus, sizeof(msgstatus), " with message(s) waiting\n"); snprintf(msgstatus, sizeof(msgstatus), " with %d new and %d old messages waiting", reg->messages & 0xff, reg->messages >> 8);
else if (reg->messages > 1) else if (reg->messages > 1)
snprintf(msgstatus, sizeof(msgstatus), " with %d messages waiting\n", reg->messages); snprintf(msgstatus, sizeof(msgstatus), " with %d new messages waiting\n", reg->messages);
else if (reg->messages > 0) else if (reg->messages > 0)
snprintf(msgstatus, sizeof(msgstatus), " with 1 message waiting\n"); snprintf(msgstatus, sizeof(msgstatus), " with 1 new message waiting\n");
else else
snprintf(msgstatus, sizeof(msgstatus), " with no messages waiting\n"); snprintf(msgstatus, sizeof(msgstatus), " with no messages waiting\n");
snprintf(ourip, sizeof(ourip), "%s:%d", ast_inet_ntoa(iabuf, sizeof(iabuf), reg->us.sin_addr), ntohs(reg->us.sin_port)); snprintf(ourip, sizeof(ourip), "%s:%d", ast_inet_ntoa(iabuf, sizeof(iabuf), reg->us.sin_addr), ntohs(reg->us.sin_port));

Write Preview
Loading…
Cancel
Save