diff options
| author | Olle Johansson <oej@edvina.net> | 2006-04-18 06:40:01 +0000 |
|---|---|---|
| committer | Olle Johansson <oej@edvina.net> | 2006-04-18 06:40:01 +0000 |
| commit | 40161ae947c1c24c18015c434a5ef6bff58e6d38 (patch) | |
| tree | 773ad2d049229a04b067f4093d46a9b3c579bde9 /channels/chan_sip.c | |
| parent | 8a066de9571303a135b7e779820abce34ea0f15f (diff) | |
- Move subscribeuri away from refer-to, since refer-to is moving away from sip_pvt
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21039 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_sip.c')
| -rw-r--r-- | channels/chan_sip.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 366185d32..e37611f78 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -753,6 +753,7 @@ static struct sip_pvt { AST_STRING_FIELD(exten); /*!< Extension where to start */ AST_STRING_FIELD(context); /*!< Context for this call */ AST_STRING_FIELD(subscribecontext); /*!< Subscribecontext */ + AST_STRING_FIELD(subscribeuri); /*!< Subscribecontext */ AST_STRING_FIELD(fromdomain); /*!< Domain to show in the from field */ AST_STRING_FIELD(fromuser); /*!< User to show in the user field */ AST_STRING_FIELD(fromname); /*!< Name to show in the user field */ @@ -8692,7 +8693,7 @@ static int __sip_show_channels(int fd, int argc, char *argv[], int subscriptions S_OR(cur->username, S_OR(cur->cid_num, "(None)")), cur->callid, /* the 'complete' exten/context is hidden in the refer_to field for subscriptions */ - cur->subscribed == MWI_NOTIFICATION ? "--" : cur->refer_to, + cur->subscribed == MWI_NOTIFICATION ? "--" : cur->subscribeuri, cur->subscribed == MWI_NOTIFICATION ? "<none>" : ast_extension_state2str(cur->laststate), subscription_type2str(cur->subscribed), cur->subscribed == MWI_NOTIFICATION ? (cur->relatedpeer ? cur->relatedpeer->mailbox : "<none>") : "<none>" @@ -11498,7 +11499,7 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req, transmit_state_notify(p, firststate, 1); /* Send first notification */ append_history(p, "Subscribestatus", "%s", ast_extension_state2str(firststate)); /* hide the 'complete' exten/context in the refer_to field for later display */ - ast_string_field_build(p, refer_to, "%s@%s", p->exten, p->context); + ast_string_field_build(p, subscribeuri, "%s@%s", p->exten, p->context); /* remove any old subscription from this peer for the same exten/context, as the peer has obviously forgotten about it and it's wasteful to wait |