kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-22 04:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 271689 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r271689 | mnicholson | 2010-06-22 07:52:27 -0500 (Tue, 22 Jun 2010) | 8 lines
  
  Modify chan_sip's packet generation api to automatically calculate the Content-Length.  This is done by storing packet content in a buffer until it is actually time to send the packet, at which time the size of the packet is calculated.  This change was made to ensure that the Content-Length is always correct.
  
  (closes issue #17326)
  Reported by: kenner
  Tested by: mnicholson, kenner
  
  Review: https://reviewboard.asterisk.org/r/693/
........


This change also adds an ast_str_copy_string() function (similar to ast_copy_string), that copies one ast_str into another, properly handling embedded nulls.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@271690 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Nicholson
2010-06-22 12:58:28 +00:00
parent e3873889b8
commit 9bbeb945e8
3 changed files with 147 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/asterisk/strings.h
View File

@@ -582,6 +582,23 @@ int ast_str_make_space(struct ast_str **buf, size_t new_len),
)
#endif
AST_INLINE_API(
int ast_str_copy_string(struct ast_str **dst, struct ast_str *src),
{
/* make sure our destination is large enough */
if (src->__AST_STR_USED + 1 > (*dst)->__AST_STR_LEN) {
if (ast_str_make_space(dst, src->__AST_STR_USED + 1)) {
return -1;
}
}
memcpy((*dst)->__AST_STR_STR, src->__AST_STR_STR, src->__AST_STR_USED + 1);
(*dst)->__AST_STR_USED = src->__AST_STR_USED;
return 0;
}
)
#define ast_str_alloca(init_len) \
({ \
struct ast_str *__ast_str_buf; \