[asterisk-dev] [Code Review] Truncate host:port when checking SIP domains and make the URI parsing API more explicit about returning host:port and not a domain

[wdoekes]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviewboard.asterisk.org/r/1574/#review4749
-----------------------------------------------------------

Ship it!


Looks good. Especially after you consider my issue with the truncate_hostport().

And, don't forget the new code in 10/trunk when merging:

+static int sip_msg_send(const struct ast_msg *msg, const char *to, const char *from)
...
+                               ast_string_field_set(pvt, fromdomain, domain);


/branches/1.8/channels/chan_sip.c
<https://reviewboard.asterisk.org/r/1574/#comment8933>

    Hm.. this had me puzzled for a while. Passing a char** instead of a char* is inconsistent with the rest of the source if all that it can to is truncate the string. (E.g. ast_uri_decode() takes a char*.)
    
    But if you think about what it does (or can do), it should probably be called extract_host_from_hostport instead. (I.e. in the '[' case, it moves the pointer and if you weren't so familiar with the inner workings of ast_sockaddr_split_hostport it could even set *hostport to NULL in case of garbage.)
    
    


- wdoekes


On Nov. 9, 2011, 12:04 a.m., Terry Wilson wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviewboard.asterisk.org/r/1574/
> -----------------------------------------------------------
> 
> (Updated Nov. 9, 2011, 12:04 a.m.)
> 
> 
> Review request for Asterisk Developers and wdoekes.
> 
> 
> Summary
> -------
> 
> In reviewing https://reviewboard.asterisk.org/r/1533/ I noticed that going from 1.4 to 1.8, setting domain=x.x.x.x stopped matching when receiving a request to x.x.x.x. The reason is that the parse_uri function returns host:port in what was labeled the "domain" variable in 1.8 when in 1.4 the parsing was done in each individual function and the port truncated manually. For example, peer->fromdomain could be set to a host:port, even though it is specifically split into peer->fromdomain and peer->fromport other places in the code.
> 
> We can't change the parsing function because sometimes we actually use the host:port form of the result (as in when passing it to ast_sockaddr_resolve_first), so we need to do the truncation manually when appropriate. This patch does two things: 1) it renames the "domain" variables in the API functions to "hostport" to more accurately reflect what we are really returning and 2) implements a truncate_hostport function and uses it where appropriate.
> 
> 
> Diffs
> -----
> 
>   /branches/1.8/channels/chan_sip.c 343673 
>   /branches/1.8/channels/sip/include/reqresp_parser.h 343673 
>   /branches/1.8/channels/sip/include/sip.h 343673 
>   /branches/1.8/channels/sip/reqresp_parser.c 343673 
> 
> Diff: https://reviewboard.asterisk.org/r/1574/diff
> 
> 
> Testing
> -------
> 
> Ran the SIP unit tests and SIP-related testsuite tests and saw no difference in behavior. Set domain=127.0.0.1 and verified register requests started working.
> 
> 
> Thanks,
> 
> Terry
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-dev/attachments/20111109/84ac9c75/attachment.htm>