[svn-commits] twilson: branch kpfleming/eventfd r345217 - in /team/kpfleming/eventfd: ./ ch...

[SVN commits to the Digium repositories]

Author: twilson
Date: Mon Nov 14 13:43:58 2011
New Revision: 345217

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=345217
Log:
Multiple revisions 345162,345165

........
  r345162 | wdoekes | 2011-11-14 13:03:29 -0600 (Mon, 14 Nov 2011) | 15 lines
  
  Update reqresp_parser parse_uri doxygen comments.
  
  The issue mentioned in the bug report had been fixed recently by
  twilson. The reporter included this documentation fix.
  
  (closes issue ASTERISK-18572)
  Reported by: Richard Miller
  Patch by: Richard Miller (modified)
  ........
  
  Merged revisions 345160 from http://svn.asterisk.org/svn/asterisk/branches/1.8
  ........
  
  Merged revisions 345161 from http://svn.asterisk.org/svn/asterisk/branches/10
........
  r345165 | twilson | 2011-11-14 13:12:49 -0600 (Mon, 14 Nov 2011) | 22 lines
  
  Don't read past end of input when calling write()
  
  int blah = 1;
  ...
  write(chan->alertpipe[1], &blah, new_frames * sizeof(blah)) !=
  (new_frames * sizeof(blah)))
  
  is only valid when new_frames == 1. Otherwise we start reading into adjacent
  variables declared on the stack. The read end discards what is read, so the
  values don't matter but it's not a good idea to read past where we want even
  though new_frames is almost always 1 and should never be large. This patch is
  basically taken out of kpfleming's eventfd branch, as he mentioned that he
  remembered fixing it there when I talked to him about this issue.
  
  Review: https://reviewboard.asterisk.org/r/1583/
  ........
  
  Merged revisions 345163 from http://svn.asterisk.org/svn/asterisk/branches/1.8
  ........
  
  Merged revisions 345164 from http://svn.asterisk.org/svn/asterisk/branches/10
........

Merged revisions 345162,345165 from http://svn.asterisk.org/svn/asterisk/trunk

Modified:
    team/kpfleming/eventfd/   (props changed)
    team/kpfleming/eventfd/channels/sip/include/reqresp_parser.h

Propchange: team/kpfleming/eventfd/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Propchange: team/kpfleming/eventfd/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Nov 14 13:43:58 2011
@@ -1,1 +1,1 @@
-/trunk:1-345129
+/trunk:1-345216

Modified: team/kpfleming/eventfd/channels/sip/include/reqresp_parser.h
URL: http://svnview.digium.com/svn/asterisk/team/kpfleming/eventfd/channels/sip/include/reqresp_parser.h?view=diff&rev=345217&r1=345216&r2=345217
==============================================================================
--- team/kpfleming/eventfd/channels/sip/include/reqresp_parser.h (original)
+++ team/kpfleming/eventfd/channels/sip/include/reqresp_parser.h Mon Nov 14 13:43:58 2011
@@ -29,11 +29,13 @@
  * - Multiple scheme's can be specified ',' delimited. ex: "sip:,sips:"
  * - If a component is not requested, do not split around it. This means
  *   that if we don't have domain, we cannot split name:pass.
- * - It is safe to call with ret_name, pass, domain, port pointing all to
+ * - It is safe to call with ret_name, pass, hostport pointing all to
  *   the same place.
- * - If no secret parameter is provided, ret_name will return with both parts, user:secret
- * - If no port parameter is provided, domain will return with both parts, domain:port
- * - This function overwrites the the uri string.
+ * - If no secret parameter is provided, ret_name will return with both
+ *   parts, user:secret.
+ * - If the URI contains a port number, hostport will return with both
+ *   parts, host:port.
+ * - This function overwrites the the URI string.
  * 
  * \retval 0 on success
  * \retval -1 on error.