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

Merged revisions 352862 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r352862 | alecdavis | 2012-01-27 13:05:30 +1300 (Fri, 27 Jan 2012) | 12 lines
  
  rfc4235 - Section 4.1: Versions MUST be representable using a non-negative 32 bit integer.
  
  If a BLF subscription exists for long enough, using %d may print negative version numbers.
  Unlikely, as 2^32 at 1 update per second is ~137 years, or half that before the versions number started going negative.
  
  Tested with Asterisk 1.8.8.2 with Grandstream phones.
   
  alecdavis (license 585)
  Tested by: alecdavis
   
  Review: https://reviewboard.asterisk.org/r/1694/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@352863 65c4cc65-6c06-0410-ace0-fbb531ad65f3
10-digiumphones
Alec L Davis 14 years ago
parent a22b12bec5
commit 787c107b36
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

6
channels/chan_sip.c
Unescape View File

@ -12877,7 +12877,7 @@ static void state_notify_build_xml(int state, int full, const char *exten, const
break; break;
case DIALOG_INFO_XML: /* SNOM subscribes in this format */ case DIALOG_INFO_XML: /* SNOM subscribes in this format */
ast_str_append(tmp, 0, "<?xml version=\"1.0\"?>\n"); ast_str_append(tmp, 0, "<?xml version=\"1.0\"?>\n");
ast_str_append(tmp, 0, "<dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"%d\" state=\"%s\" entity=\"%s\">\n", p->dialogver, full ? "full" : "partial", mto); ast_str_append(tmp, 0, "<dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"%u\" state=\"%s\" entity=\"%s\">\n", p->dialogver, full ? "full" : "partial", mto);
if ((state & AST_EXTENSION_RINGING) && sip_cfg.notifyringing) { if ((state & AST_EXTENSION_RINGING) && sip_cfg.notifyringing) {
const char *local_display = exten; const char *local_display = exten;
char *local_target = ast_strdupa(mto); char *local_target = ast_strdupa(mto);
@ -25406,7 +25406,7 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req,
if (p->subscribed == NONE) { /* if the subscribed field is not already set, and there is no accept header... */ if (p->subscribed == NONE) { /* if the subscribed field is not already set, and there is no accept header... */
transmit_response(p, "489 Bad Event", req); transmit_response(p, "489 Bad Event", req);
ast_log(LOG_WARNING,"SUBSCRIBE failure: no Accept header: pvt: " ast_log(LOG_WARNING,"SUBSCRIBE failure: no Accept header: pvt: "
"stateid: %d, laststate: %d, dialogver: %d, subscribecont: " "stateid: %d, laststate: %d, dialogver: %u, subscribecont: "
"'%s', subscribeuri: '%s'\n", "'%s', subscribeuri: '%s'\n",
p->stateid, p->stateid,
p->laststate, p->laststate,
@ -25432,7 +25432,7 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req,
transmit_response(p, mybuf, req); transmit_response(p, mybuf, req);
ast_log(LOG_WARNING,"SUBSCRIBE failure: unrecognized format:" ast_log(LOG_WARNING,"SUBSCRIBE failure: unrecognized format:"
"'%s' pvt: subscribed: %d, stateid: %d, laststate: %d," "'%s' pvt: subscribed: %d, stateid: %d, laststate: %d,"
"dialogver: %d, subscribecont: '%s', subscribeuri: '%s'\n", "dialogver: %u, subscribecont: '%s', subscribeuri: '%s'\n",
unknown_acceptheader, unknown_acceptheader,
(int)p->subscribed, (int)p->subscribed,
p->stateid, p->stateid,

2
channels/sip/include/sip.h
Unescape View File

@ -1117,7 +1117,7 @@ struct sip_pvt {
enum subscriptiontype subscribed; /*!< SUBSCRIBE: Is this dialog a subscription? */ enum subscriptiontype subscribed; /*!< SUBSCRIBE: Is this dialog a subscription? */
int stateid; /*!< SUBSCRIBE: ID for devicestate subscriptions */ int stateid; /*!< SUBSCRIBE: ID for devicestate subscriptions */
int laststate; /*!< SUBSCRIBE: Last known extension state */ int laststate; /*!< SUBSCRIBE: Last known extension state */
int dialogver; /*!< SUBSCRIBE: Version for subscription dialog-info */ uint32_t dialogver; /*!< SUBSCRIBE: Version for subscription dialog-info */
struct ast_dsp *dsp; /*!< Inband DTMF or Fax CNG tone Detection dsp */ struct ast_dsp *dsp; /*!< Inband DTMF or Fax CNG tone Detection dsp */

Write Preview
Loading…
Cancel
Save