version 1.48, 2010/02/02 22:49:34 |
version 1.53, 2013/11/08 11:15:19 |
|
|
|
|
#include <string.h> |
#include <string.h> |
#include <stdarg.h> |
#include <stdarg.h> |
|
#include <stdlib.h> |
|
|
#include "xmalloc.h" |
#include "xmalloc.h" |
#include "buffer.h" |
#include "buffer.h" |
|
|
|
|
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); |
} |
} |
|
|
|
|
/* 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_ret(Buffer *buffer, u_int *length_ptr) |
buffer_get_string_ptr_ret(Buffer *buffer, u_int *length_ptr) |
{ |
{ |
|
|
* 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; |
} |
} |
|
|
/* |
/* |