diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-21 22:54:20 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-21 22:54:20 +0000 |
| commit | 576e5fdc8765174c3b6d8e65c5d9bae5be53e549 (patch) | |
| tree | f54a402896283e47539d0723002314b682b8a39d /channels | |
| parent | 52613ca8d44f6119622ace6f6fba347a6dfc218f (diff) | |
Merged revisions 213738 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r213738 | tilghman | 2009-08-21 17:36:39 -0500 (Fri, 21 Aug 2009) | 2 lines
Clarifying comments in sip_register, and removing a dead section
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@213739 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 2ead3da7f..5c38affbb 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -7158,7 +7158,7 @@ static int sip_register(const char *value, int lineno) * host2.extension => [extension] * host1.expiry => [expiry] */ - AST_NONSTANDARD_RAW_ARGS(host2, hostpart, '/'); + AST_NONSTANDARD_RAW_ARGS(host2, host1.hostpart, '/'); /*! * user1.userpart => [peer?][transport://]user[@domain] @@ -7169,14 +7169,35 @@ static int sip_register(const char *value, int lineno) * host2.extension => extension * host1.expiry => expiry */ - AST_NONSTANDARD_RAW_ARGS(host3, hostpart, ':'); + AST_NONSTANDARD_RAW_ARGS(host3, host2.hostpart, ':'); + /*! + * peername => peer + * user2.userpart => [transport://]user[@domain] + * user1.secret => secret + * user1.authuser => authuser + * host3.host => host + * host3.port => port + * host2.extension => extension (callback) + * host1.expiry => expiry + */ if ((tmp = strchr(user1.userpart, '?'))) { *tmp = '\0'; peername = user1.userpart; user1.userpart = tmp + 1; } + /*! + * peername => peer + * transport_str => transport + * username => user[@domain] + * user1.secret => secret + * user1.authuser => authuser + * host3.host => host + * host3.port => port + * host2.extension => extension (callback) + * host1.expiry => expiry + */ if ((tmp = strstr(user1.userpart, "://"))) { *tmp = '\0'; transport_str = user1.userpart; |