Index: channels/chan_sip.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v retrieving revision 1.672 diff -u -r1.672 chan_sip.c --- channels/chan_sip.c 9 Mar 2005 04:56:51 -0000 1.672 +++ channels/chan_sip.c 9 Mar 2005 06:06:03 -0000 @@ -122,9 +122,10 @@ static char default_useragent[AST_MAX_EXTENSION] = DEFAULT_USERAGENT; #define DEFAULT_CONTEXT "default" -static char default_context[AST_MAX_EXTENSION] = DEFAULT_CONTEXT; +static char default_context[AST_MAX_EXTENSION]; /* Default context for calls */ +static char default_subscribecontext[AST_MAX_EXTENSION]; /* Default context for subscriptions */ -static char default_language[MAX_LANGUAGE] = ""; +static char default_language[MAX_LANGUAGE] = ""; /* Default language */ #define DEFAULT_CALLERID "asterisk" static char default_callerid[AST_MAX_EXTENSION] = DEFAULT_CALLERID; @@ -354,6 +355,7 @@ char from[256]; /* The From: header */ char useragent[256]; /* User agent in SIP request */ char context[AST_MAX_EXTENSION]; /* Context for this call */ + char subscribecontext[AST_MAX_EXTENSION]; /* SubscribeContext for this call */ char fromdomain[AST_MAX_EXTENSION]; /* Domain to show in the from field */ char fromuser[AST_MAX_EXTENSION]; /* User to show in the user field */ char fromname[AST_MAX_EXTENSION]; /* Name to show in the user field */ @@ -400,7 +402,8 @@ int rtpkeepalive; /* Send RTP packets for keepalive */ int subscribed; /* Is this call a subscription? */ - int stateid; + int stateid; /* State ID */ + int laststate; /* Last Known State */ int dialogver; struct ast_dsp *vad; /* Voice Activation Detection dsp */ @@ -436,7 +439,7 @@ ASTOBJ_COMPONENTS(struct sip_user); char secret[80]; /* Password */ char md5secret[80]; /* Password in md5 */ - char context[80]; /* Default context for incoming calls */ + char context[AST_MAX_EXTENSION]; /* Default context for incoming calls */ char cid_num[80]; /* Caller ID num */ char cid_name[80]; /* Caller ID name */ char accountcode[20]; /* Account code */ @@ -464,7 +467,8 @@ /* peer->name is the unique name of this object */ char secret[80]; /* Password */ char md5secret[80]; /* Password in MD5 */ - char context[80]; /* Default context for incoming calls */ + char context[AST_MAX_EXTENSION]; /* Default context for incoming calls */ + char subscribecontext[AST_MAX_EXTENSION]; /* Context for subscriptions */ char username[80]; /* Temporary username until registration */ char accountcode[20]; /* Account code */ int amaflags; /* AMA Flags (for billing) */ @@ -589,6 +593,7 @@ /* The list of manual NOTIFY types we know how to send */ struct ast_config *notify_types; +static void append_date(struct sip_request *req); static struct ast_frame *sip_read(struct ast_channel *ast); static int transmit_response(struct sip_pvt *p, char *msg, struct sip_request *req); static int transmit_response_with_sdp(struct sip_pvt *p, char *msg, struct sip_request *req, int retrans); @@ -3186,7 +3191,8 @@ if (maddr) { maddr += 6; hn = strspn(maddr, "0123456789."); - if (hn > (sizeof(hostname) - 1)) hn = sizeof(hostname) - 1; + if (hn > (sizeof(hostname) - 1)) + hn = sizeof(hostname) - 1; strncpy(hostname, maddr, hn); hostname[hn] = '\0'; /* safe */ } @@ -3271,16 +3277,20 @@ add_header(resp, "Allow", ALLOWED_METHODS); if (p->expiry) { /* For registration responses, we also need expiry and - contact info */ + contact info, but not for subscriptions */ char contact[256]; - char tmp[256]; + snprintf(contact, sizeof(contact), "%s;expires=%d", p->our_contact, p->expiry); - snprintf(tmp, sizeof(tmp), "%d", p->expiry); - add_header(resp, "Expires", tmp); add_header(resp, "Contact", contact); } else { add_header(resp, "Contact", p->our_contact); } + if (p->expiry) { /* Subscriptions and registrations */ + char tmp[256]; + + snprintf(tmp, sizeof(tmp), "%d", p->expiry); + add_header(resp, "Expires", tmp); + } if (p->maxforwards) { char tmp[256]; snprintf(tmp, sizeof(tmp), "%d", p->maxforwards); @@ -3378,7 +3388,13 @@ add_header(req, "From", ot); add_header(req, "To", of); } - add_header(req, "Contact", p->our_contact); + if (!strcasecmp(msg, "MESSAGE")) { + /* Add date header to MESSAGE */ + append_date(req); + } else { + /* Do not add Contact on MESSAGE */ + add_header(req, "Contact", p->our_contact); + } copy_header(req, orig, "Call-ID"); add_header(req, "CSeq", tmp); @@ -4056,10 +4072,12 @@ int maxbytes = 0; int bytes = 0; char from[256], to[256]; - char *t, *c, *a; + char *t = NULL, *c, *a; char *mfrom, *mto; struct sip_request req; char clen[20]; + char hint[AST_MAX_EXTENSION]; + int hintstate = 1; memset(from, 0, sizeof(from)); memset(to, 0, sizeof(to)); @@ -4077,30 +4095,38 @@ reqprep(&req, p, "NOTIFY", 0, 1); - if (p->subscribed == 1) { - strncpy(to, get_header(&p->initreq, "To"), sizeof(to)-1); + /* Check which device/devices we are watching and if they are registred */ + /* If they are not registred, we will override notification and show no availability */ + if (ast_get_hint(hint, sizeof(hint), NULL, 0, NULL, p->context, p->exten)) { + if(ast_device_state(hint) == AST_DEVICE_UNAVAILABLE) + hintstate = 0; /* Not registred */ + } + + strncpy(to, get_header(&p->initreq, "To"), sizeof(to)-1); + c = ditch_braces(to); + if (strncmp(c, "sip:", 4)) { + ast_log(LOG_WARNING, "Huh? Not a SIP header (%s)?\n", c); + return -1; + } + if ((a = strchr(c, ';'))) { + *a = '\0'; + } + mto = c; + + if ((state==AST_EXTENSION_UNAVAILABLE) || (state==AST_EXTENSION_BUSY) || !hintstate) + state = 2; /* Closed */ + else if (state==AST_EXTENSION_INUSE) + state = 1; /* In use */ + else + state = 0; /* Open */ - c = ditch_braces(to); - if (strncmp(c, "sip:", 4)) { - ast_log(LOG_WARNING, "Huh? Not a SIP header (%s)?\n", c); - return -1; - } - if ((a = strchr(c, ';'))) { - *a = '\0'; - } - mto = c; + ast_log(LOG_WARNING, "))))) Extension %s@%s Status %d\n", p->exten, p->context, state); + if (p->subscribed == 1 || p->subscribed == 3) { add_header(&req, "Event", "presence"); add_header(&req, "Subscription-State", "active"); add_header(&req, "Content-Type", "application/xpidf+xml"); - if ((state==AST_EXTENSION_UNAVAILABLE) || (state==AST_EXTENSION_BUSY)) - state = 2; - else if (state==AST_EXTENSION_INUSE) - state = 1; - else - state = 0; - t = tmp; maxbytes = sizeof(tmp); bytes = snprintf(t, maxbytes, "\n"); @@ -4128,7 +4154,41 @@ t += bytes; maxbytes -= bytes; bytes = snprintf(t, maxbytes, "\n\n\n"); - } else { + } else if (p->subscribed == 4) { /* pidf+xml */ + add_header(&req, "Event", "presence"); + add_header(&req, "Subscription-State", "active"); + add_header(&req, "Content-Type", "application/pidf+xml"); + t = tmp; + maxbytes = sizeof(tmp); + bytes = snprintf(t, maxbytes, "\n"); + t += bytes; + maxbytes -= bytes; + bytes = snprintf(t, maxbytes, "\n", mfrom); + t += bytes; + maxbytes -= bytes; + bytes = snprintf(t, maxbytes, "\n", p->exten); + t += bytes; + maxbytes -= bytes; + bytes = snprintf(t, maxbytes, "%s\n", mto); + t += bytes; + maxbytes -= bytes; + + bytes = snprintf(t, maxbytes, "%s\n", !state ? "open" : "closed"); + t += bytes; + maxbytes -= bytes; + + bytes = snprintf(t, maxbytes, "%s", state != 0?"on-the-phone\n":""); + t += bytes; + maxbytes -= bytes; + + bytes = snprintf(t, maxbytes, "%s", state == 1?"On the phone\n":""); + t += bytes; + maxbytes -= bytes; + + bytes = snprintf(t, maxbytes, "\n\n"); + t += bytes; + maxbytes -= bytes; + } else if (p->subscribed == 2) { add_header(&req, "Event", "dialog"); add_header(&req, "Content-Type", "application/dialog-info+xml"); @@ -4147,6 +4207,8 @@ t += bytes; maxbytes -= bytes; bytes = snprintf(t, maxbytes, "\n\n"); + t += bytes; + maxbytes -= bytes; } if (t > tmp + sizeof(tmp)) ast_log(LOG_WARNING, "Buffer overflow detected!! (Please file a bug report)\n"); @@ -4593,7 +4655,7 @@ manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "Peer: SIP/%s\r\nPeerStatus: Unregistered\r\nCause: Expired\r\n", p->name); register_peer_exten(p, 0); p->expire = -1; - ast_device_state_changed("SIP/%s", p->name); + ast_device_state_changed("SIP/%s", p->name); /* Activate notification */ if (ast_test_flag(p, SIP_SELFDESTRUCT) || ast_test_flag((&p->flags_page2), SIP_PAGE2_RTAUTOCLEAR)) { ASTOBJ_MARK(p); prune_peers(); @@ -5022,7 +5084,7 @@ #endif ) return 0; - if (!strcasecmp(method, "REGISTER")) { + if (!strcasecmp(method, "REGISTER") || !strcasecmp(method, "SUBSCRIBE")) { /* On a REGISTER, we have to use 401 and its family of headers instead of 407 and its family of headers -- GO SIP! Whoo hoo! Two things that do the same thing but are used in different circumstances! What a surprise. */ @@ -5148,21 +5210,25 @@ return res; } -/*--- cb_extensionstate: Part of thte SUBSCRIBE support subsystem ---*/ +/*--- cb_extensionstate: Callback for the SUBSCRIBE (devicestate notification) support subsystem ---*/ +/* If you add an "hint" priority to the dial plan, you will get notifications + */ static int cb_extensionstate(char *context, char* exten, int state, void *data) { - struct sip_pvt *p = data; - if (state == -1) { - sip_scheddestroy(p, 15000); - p->stateid = -1; - return 0; - } - - transmit_state_notify(p, state, 1); + struct sip_pvt *p = data; /* Pointer to the subscription "call" */ + + if (state == -1) { + sip_scheddestroy(p, 15000); + p->stateid = -1; + return 0; + } + + transmit_state_notify(p, state, 1); + p->laststate = state; - if (option_debug) - ast_verbose(VERBOSE_PREFIX_1 "Extension Changed %s new state %d for Notify User %s\n", exten, state, p->username); - return 0; + if (option_debug) + ast_verbose(VERBOSE_PREFIX_1 "Extension Changed %s new state %d for Notify User %s\n", exten, state, p->username); + return 0; } /*--- register_verify: Verify registration of user */ @@ -5174,6 +5240,7 @@ char iabuf[INET_ADDRSTRLEN]; char *name, *c; char *t; + /* Terminate URI */ t = uri; while(*t && (*t > 32) && (*t != ';')) @@ -5182,6 +5249,7 @@ strncpy(tmp, get_header(req, "To"), sizeof(tmp) - 1); c = ditch_braces(tmp); + /* Ditch ;user=phone */ name = strchr(c, ';'); if (name) @@ -5242,7 +5310,7 @@ } } if (!res) { - ast_device_state_changed("SIP/%s", peer->name); + ast_device_state_changed("SIP/%s", peer->name); /* Activate notification */ } if (res < 0) transmit_response(p, "403 Forbidden", &p->initreq); @@ -5285,7 +5353,7 @@ char tmp[256] = "", *c, *a; char tmpf[256]= "", *fr; struct sip_request *req; - + req = oreq; if (!req) req = &p->initreq; @@ -5858,6 +5926,8 @@ strncpy(p->fullcontact, peer->fullcontact, sizeof(p->fullcontact) - 1); if (!ast_strlen_zero(peer->context)) strncpy(p->context, peer->context, sizeof(p->context) - 1); + if (!ast_strlen_zero(peer->subscribecontext)) + strncpy(p->subscribecontext, peer->subscribecontext, sizeof(p->subscribecontext) - 1); strncpy(p->peersecret, peer->secret, sizeof(p->peersecret) - 1); strncpy(p->peermd5secret, peer->md5secret, sizeof(p->peermd5secret) - 1); strncpy(p->language, peer->language, sizeof(p->language) -1); @@ -5926,14 +5996,26 @@ /*--- receive_message: Receive SIP MESSAGE method messages ---*/ -/* we handle messages within current calls currently */ +/* We only handle messages within current calls currently */ +/* Reference: RFC 3428 */ static void receive_message(struct sip_pvt *p, struct sip_request *req) { char buf[1024]; struct ast_frame f; + char *content_type; + + content_type = get_header(req, "Content-Type"); + if (strcmp(content_type, "text/plain")) { + /* No text/plain attachment */ + transmit_response(p, "415 unsupported media type", req); /* Good enough or? */ + ast_set_flag(p, SIP_NEEDDESTROY); + return; + } if (get_msg_text(buf, sizeof(buf), req)) { ast_log(LOG_WARNING, "Unable to retrieve text from %s\n", p->callid); + transmit_response(p, "202 Accepted", req); + ast_set_flag(p, SIP_NEEDDESTROY); return; } if (p->owner) { @@ -5946,7 +6028,15 @@ f.data = buf; f.datalen = strlen(buf); ast_queue_frame(p->owner, &f); + /* Should we respond somehow? */ + transmit_response(p, "202 Accepted", req); + /* We should respond 202 accepted, since we relay the message */ + } else { + ast_log(LOG_WARNING,"Received message to %s from %s, dropped it...\n Content-Type:%s\n Message: %s\n", get_header(req,"To"), get_header(req,"From"), content_type, buf); + transmit_response(p, "405 Method not allowed", req); /* Good enough or? */ } + ast_set_flag(p, SIP_NEEDDESTROY); + return; } /*--- sip_show_inuse: CLI Command to show calls within limits set by @@ -6337,7 +6427,7 @@ strncpy(status, "UNKNOWN", sizeof(status) - 1); ast_cli(fd, "%s\n",status); ast_cli(fd, " Useragent : %s\n", peer->useragent); - ast_cli(fd, " Full Contact : %s\n", peer->fullcontact); + ast_cli(fd, " Reg. Contact : %s\n", peer->fullcontact); if (peer->chanvars) { ast_cli(fd, " Variables :\n"); for (v = peer->chanvars ; v ; v = v->next) @@ -6456,7 +6546,8 @@ static int __sip_show_channels(int fd, int argc, char *argv[], int subscriptions) { -#define FORMAT3 "%-15.15s %-10.10s %-21.21s %-15.15s\n" +#define FORMAT4 "%-15.15s %-10.10s %-21.21s %-15.15s %10s\n" +#define FORMAT3 "%-15.15s %-10.10s %-21.21s %-15.15s %2d (%d)\n" #define FORMAT2 "%-15.15s %-10.10s %-11.11s %-11.11s %s %s\n" #define FORMAT "%-15.15s %-10.10s %-11.11s %5.5d/%5.5d %-6.6s%s %s\n" struct sip_pvt *cur; @@ -6469,7 +6560,7 @@ if (!subscriptions) ast_cli(fd, FORMAT2, "Peer", "User/ANR", "Call ID", "Seq (Tx/Rx)", "Format", "Last Msg"); else - ast_cli(fd, FORMAT3, "Peer", "User", "Call ID", "URI"); + ast_cli(fd, FORMAT4, "Peer", "User", "Call ID", "Extension", "Last State"); while (cur) { if (!cur->subscribed && !subscriptions) { ast_cli(fd, FORMAT, ast_inet_ntoa(iabuf, sizeof(iabuf), cur->sa.sin_addr), @@ -6484,7 +6575,8 @@ if (cur->subscribed && subscriptions) { ast_cli(fd, FORMAT3, ast_inet_ntoa(iabuf, sizeof(iabuf), cur->sa.sin_addr), ast_strlen_zero(cur->username) ? ( ast_strlen_zero(cur->cid_num) ? "(None)" : cur->cid_num ) : cur->username, - cur->callid, cur->uri); + cur->callid, cur->exten, cur->laststate, cur->subscribed); + numchans++; } cur = cur->next; @@ -7390,7 +7482,7 @@ peer->lastms = pingtime; peer->call = NULL; if (statechanged) { - ast_device_state_changed("SIP/%s", peer->name); + ast_device_state_changed("SIP/%s", peer->name); /* Activate notification */ if (newstate == 2) { manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "Peer: SIP/%s\r\nPeerStatus: Lagged\r\nTime: %d\r\n", peer->name, pingtime); } else { @@ -8309,16 +8401,12 @@ ast_set_flag(p, SIP_NEEDDESTROY); transmit_response(p, "200 OK", req); } else if (!strcasecmp(cmd, "MESSAGE")) { - if (p->lastinvite) { - if (!ignore) { - if (debug) - ast_verbose("Receiving message!\n"); - receive_message(p, req); - } - transmit_response(p, "200 OK", req); + if (!ignore) { + if (debug) + ast_verbose("Receiving message!\n"); + receive_message(p, req); } else { - transmit_response(p, "405 Method Not Allowed", req); - ast_set_flag(p, SIP_NEEDDESTROY); + transmit_response(p, "202 ACCEPTED", req); } } else if (!strcasecmp(cmd, "SUBSCRIBE")) { if (!ignore) { @@ -8346,8 +8434,11 @@ return 0; } /* Initialize the context if it hasn't been already */ - if (ast_strlen_zero(p->context)) + if (p->subscribecontext && !ast_strlen_zero(p->subscribecontext)) { + strncpy(p->context, p->subscribecontext, sizeof(p->context) - 1); + } else if (ast_strlen_zero(p->context)) strncpy(p->context, default_context, sizeof(p->context) - 1); + /* Get destination right away */ gotdest = get_destination(p, NULL); build_contact(p); @@ -8358,12 +8449,34 @@ transmit_response(p, "484 Address Incomplete", req); ast_set_flag(p, SIP_NEEDDESTROY); } else { + char *event; + event = get_header(req, "Event"); /* Get the even pacīkage name */ + /* Initialize tag */ p->tag = rand(); - if (!strcmp(get_header(req, "Accept"), "application/dialog-info+xml")) - p->subscribed = 2; - else if (!strcmp(get_header(req, "Accept"), "application/simple-message-summary")) { - /* Looks like they actually want a mailbox */ + if (!strcmp(event,"presence")) { /* Presence, RFC 3842 */ + char *accept = get_header(req, "Accept"); + /* Header from Xten Eye-beam + Accept: multipart/related, application/rlmi+xml, application/pidf+xml, application/xpidf+xml + */ + if (strstr(accept, "application/dialog-info+xml")) + p->subscribed = 2; + /* IETF draft: draft-ietf-sipping-dialog-package-05.txt */ + /* Should not be used for SUBSCRIBE, but anyway */ + else if (!p->subscribed && strstr(accept, "application/xpidf+xml")) + p->subscribed = 1; /* Early pre-RFC 3863 format with MSN additions (Microsoft Messenger) */ + else if (!p->subscribed && strstr(accept, "application/cpim-pidf+xml")) + p->subscribed = 3; /* RFC 3863 format */ + else if (!p->subscribed && strstr(accept, "application/pidf+xml")) + p->subscribed = 4; /* RFC 3863 format */ + else { + /* Can't find a format for events that we know about */ + transmit_response(p, "489 Bad Event", req); + ast_set_flag(p, SIP_NEEDDESTROY); + return 0; + } + } else if (!strcmp(event, "message-summary") && !strcmp(get_header(req, "Accept"), "application/simple-message-summary")) { + /* Looks like they actually want a mailbox (RFC 3842) */ /* At this point, we should check if they subscribe to a mailbox that has the same extension as the peer or the mailbox id. If we configure @@ -8389,10 +8502,14 @@ ast_set_flag(p, SIP_NEEDDESTROY); } return 0; - } else - p->subscribed = 1; - if (p->subscribed) + } else { + transmit_response(p, "489 Bad Event", req); + ast_set_flag(p, SIP_NEEDDESTROY); + return 0; + } + if (p->subscribed) { p->stateid = ast_extension_state_add(p->context, p->exten, cb_extensionstate, p); + } } } else @@ -8401,16 +8518,15 @@ if (!ignore && p) p->lastinvite = seqno; if (p && !ast_test_flag(p, SIP_NEEDDESTROY)) { - if (!(p->expiry = atoi(get_header(req, "Expires")))) { + if (!(p->expiry = atoi(get_header(req, "Expires")))) { transmit_response(p, "200 OK", req); ast_set_flag(p, SIP_NEEDDESTROY); return 0; - } - /* The next line can be removed if the SNOM200 Expires bug is fixed */ - if (p->subscribed == 1) { - if (p->expiry>max_expiry) + } + if (p->subscribed != 0) { + if (p->expiry > max_expiry) p->expiry = max_expiry; - } + } /* Go ahead and free RTP port */ if (p->rtp) { ast_rtp_destroy(p->rtp); @@ -8420,9 +8536,14 @@ ast_rtp_destroy(p->vrtp); p->vrtp = NULL; } - transmit_response(p, "200 OK", req); - sip_scheddestroy(p, (p->expiry+10)*1000); - transmit_state_notify(p, ast_extension_state(NULL, p->context, p->exten),1); + if (sipdebug || option_debug > 1) + ast_log(LOG_DEBUG, "Adding subscription for extension %s context %s for peer %s\n", p->exten, p->context, p->username); + + transmit_response(p, "200 OK", req); + /* Set timer for destruction of call at expiration */ + sip_scheddestroy(p, (p->expiry+10)*1000); + /* Send first notification */ + transmit_state_notify(p, ast_extension_state(NULL, p->context, p->exten),1); } } else if (!strcasecmp(cmd, "INFO")) { if (!ignore) { @@ -8780,7 +8901,7 @@ sip_destroy(peer->call); peer->call = NULL; peer->lastms = -1; - ast_device_state_changed("SIP/%s", peer->name); + ast_device_state_changed("SIP/%s", peer->name); /* Activate notification */ /* Try again quickly */ peer->pokeexpire = ast_sched_add(sched, DEFAULT_FREQ_NOTOK, sip_poke_peer_s, peer); return 0; @@ -8875,13 +8996,35 @@ if (p) { found++; res = AST_DEVICE_UNAVAILABLE; + if (option_debug > 2) + ast_log(LOG_DEBUG, "Checking device state for peer %s\n", dest); if ((p->addr.sin_addr.s_addr || p->defaddr.sin_addr.s_addr) && (!p->maxms || ((p->lastms > -1) && (p->lastms <= p->maxms)))) { - /* peer found and valid */ - res = AST_DEVICE_UNKNOWN; + /* Peer is registred, or have default IP address + and a valid registration */ + + + /* Now check if we know anything about the state. The only way is by implementing + call control with incominglimit=X in sip.conf where X > 0 + Check if the device has incominglimit, and if qualify=on, if the device + is reachable + */ + if (p->incominglimit && (p->lastms == 0 || p->lastms <= p->maxms)) { + /* Free for a call */ + res = AST_DEVICE_NOT_INUSE; + + if (p->inUse) { /* On a call */ + res = AST_DEVICE_BUSY; + } + } else { + /* peer found and valid, state unknown */ + res = AST_DEVICE_UNKNOWN; + } } } if (!p && !found) { + if (option_debug > 2) + ast_log(LOG_DEBUG, "Checking device state for DNS host %s\n", dest); hp = ast_gethostbyname(host, &ahp); if (hp) res = AST_DEVICE_UNKNOWN; @@ -9246,6 +9389,7 @@ peer->chanvars = NULL; } strncpy(peer->context, default_context, sizeof(peer->context)-1); + strncpy(peer->subscribecontext, default_subscribecontext, sizeof(peer->subscribecontext)-1); strncpy(peer->language, default_language, sizeof(peer->language)-1); strncpy(peer->musicclass, global_musicclass, sizeof(peer->musicclass)-1); ast_copy_flags(peer, &global_flags, SIP_USEREQPHONE); @@ -9288,9 +9432,11 @@ strncpy(peer->md5secret, v->value, sizeof(peer->md5secret)-1); else if (!strcasecmp(v->name, "callerid")) { ast_callerid_split(v->value, peer->cid_name, sizeof(peer->cid_name), peer->cid_num, sizeof(peer->cid_num)); - } else if (!strcasecmp(v->name, "context")) + } else if (!strcasecmp(v->name, "context")) { strncpy(peer->context, v->value, sizeof(peer->context)-1); - else if (!strcasecmp(v->name, "fromdomain")) + } else if (!strcasecmp(v->name, "subscribecontext")) { + strncpy(peer->subscribecontext, v->value, sizeof(peer->subscribecontext)-1); + } else if (!strcasecmp(v->name, "fromdomain")) strncpy(peer->fromdomain, v->value, sizeof(peer->fromdomain)-1); else if (!strcasecmp(v->name, "usereqphone")) ast_set2_flag(peer, ast_true(v->value), SIP_USEREQPHONE); @@ -9486,6 +9632,7 @@ /* Initialize some reasonable defaults at SIP reload */ strncpy(default_context, DEFAULT_CONTEXT, sizeof(default_context) - 1); + default_subscribecontext[0] = '\0'; default_language[0] = '\0'; default_fromdomain[0] = '\0'; default_qualify = 0;