version 1.46, 2008/06/10 23:21:34 |
version 1.52, 2013/07/12 00:19:58 |
|
|
|
|
if (buffer_get_ret(buffer, (char *) buf, 4) == -1) |
if (buffer_get_ret(buffer, (char *) buf, 4) == -1) |
return (-1); |
return (-1); |
*ret = get_u32(buf); |
if (ret != NULL) |
|
*ret = get_u32(buf); |
return (0); |
return (0); |
} |
} |
|
|
|
|
|
|
if (buffer_get_ret(buffer, (char *) buf, 8) == -1) |
if (buffer_get_ret(buffer, (char *) buf, 8) == -1) |
return (-1); |
return (-1); |
*ret = get_u64(buf); |
if (ret != NULL) |
|
*ret = get_u64(buf); |
return (0); |
return (0); |
} |
} |
|
|
|
|
u_int len; |
u_int len; |
|
|
/* Get the length. */ |
/* Get the length. */ |
len = buffer_get_int(buffer); |
if (buffer_get_int_ret(&len, buffer) != 0) { |
|
error("buffer_get_string_ret: cannot extract length"); |
|
return (NULL); |
|
} |
if (len > 256 * 1024) { |
if (len > 256 * 1024) { |
error("buffer_get_string_ret: bad string length %u", len); |
error("buffer_get_string_ret: bad string length %u", len); |
return (NULL); |
return (NULL); |
|
|
/* Get the string. */ |
/* Get the string. */ |
if (buffer_get_ret(buffer, value, len) == -1) { |
if (buffer_get_ret(buffer, value, len) == -1) { |
error("buffer_get_string_ret: buffer_get failed"); |
error("buffer_get_string_ret: buffer_get failed"); |
xfree(value); |
free(value); |
return (NULL); |
return (NULL); |
} |
} |
/* Append a null character to make processing easier. */ |
/* Append a null character to make processing easier. */ |
|
|
return (ret); |
return (ret); |
} |
} |
|
|
|
char * |
|
buffer_get_cstring_ret(Buffer *buffer, u_int *length_ptr) |
|
{ |
|
u_int length; |
|
char *cp, *ret = buffer_get_string_ret(buffer, &length); |
|
|
|
if (ret == NULL) |
|
return NULL; |
|
if ((cp = memchr(ret, '\0', length)) != NULL) { |
|
/* XXX allow \0 at end-of-string for a while, remove later */ |
|
if (cp == ret + length - 1) |
|
error("buffer_get_cstring_ret: string contains \\0"); |
|
else { |
|
bzero(ret, length); |
|
free(ret); |
|
return NULL; |
|
} |
|
} |
|
if (length_ptr != NULL) |
|
*length_ptr = length; |
|
return ret; |
|
} |
|
|
|
char * |
|
buffer_get_cstring(Buffer *buffer, u_int *length_ptr) |
|
{ |
|
char *ret; |
|
|
|
if ((ret = buffer_get_cstring_ret(buffer, length_ptr)) == NULL) |
|
fatal("buffer_get_cstring: buffer error"); |
|
return ret; |
|
} |
|
|
void * |
void * |
buffer_get_string_ptr(Buffer *buffer, u_int *length_ptr) |
buffer_get_string_ptr_ret(Buffer *buffer, u_int *length_ptr) |
{ |
{ |
void *ptr; |
void *ptr; |
u_int len; |
u_int len; |
|
|
len = buffer_get_int(buffer); |
if (buffer_get_int_ret(&len, buffer) != 0) |
if (len > 256 * 1024) |
return NULL; |
fatal("buffer_get_string_ptr: bad string length %u", len); |
if (len > 256 * 1024) { |
|
error("buffer_get_string_ptr: bad string length %u", len); |
|
return NULL; |
|
} |
ptr = buffer_ptr(buffer); |
ptr = buffer_ptr(buffer); |
buffer_consume(buffer, len); |
buffer_consume(buffer, len); |
if (length_ptr) |
if (length_ptr) |
|
|
return (ptr); |
return (ptr); |
} |
} |
|
|
|
void * |
|
buffer_get_string_ptr(Buffer *buffer, u_int *length_ptr) |
|
{ |
|
void *ret; |
|
|
|
if ((ret = buffer_get_string_ptr_ret(buffer, length_ptr)) == NULL) |
|
fatal("buffer_get_string_ptr: buffer error"); |
|
return (ret); |
|
} |
|
|
/* |
/* |
* Stores and arbitrary binary string in the buffer. |
* Stores and arbitrary binary string in the buffer. |
*/ |
*/ |
|
|
* Returns a character from the buffer (0 - 255). |
* Returns a character from the buffer (0 - 255). |
*/ |
*/ |
int |
int |
buffer_get_char_ret(char *ret, Buffer *buffer) |
buffer_get_char_ret(u_char *ret, Buffer *buffer) |
{ |
{ |
if (buffer_get_ret(buffer, ret, 1) == -1) { |
if (buffer_get_ret(buffer, ret, 1) == -1) { |
error("buffer_get_char_ret: buffer_get_ret failed"); |
error("buffer_get_char_ret: buffer_get_ret failed"); |
|
|
int |
int |
buffer_get_char(Buffer *buffer) |
buffer_get_char(Buffer *buffer) |
{ |
{ |
char ch; |
u_char ch; |
|
|
if (buffer_get_char_ret(&ch, buffer) == -1) |
if (buffer_get_char_ret(&ch, buffer) == -1) |
fatal("buffer_get_char: buffer error"); |
fatal("buffer_get_char: buffer error"); |
return (u_char) ch; |
return ch; |
} |
} |
|
|
/* |
/* |