mirror of
https://github.com/obgm/libcoap.git
synced 2026-11-05 09:22:54 +03:00
Jon Shallow
e0a6593728
Add in coap_new_binary() and coap_delete_binary() functions which operate in the same way as coap_new_string() and coap_delete_string() but work on coap_binary_t objects. include/coap2/str.h: src/str.c: Add in the coap_new_binary(), coap_resize_binary() and coap_delete_binary() functions. configure.ac: man/Makefile.am: man/coap.txt.in: man/coap_string.txt.in: (new) Add in documentation for the coap_string functions. libcoap-2.map: libcoap-2.sym: Update with new functions. coap_config.h.contiki: include/coap2/lwippools.h: include/coap2/mem.h: src/mem.c: Add support for fixed memory allocations for Cacke-Key and Cache-Entry
106 lines
2.8 KiB
C
106 lines
2.8 KiB
C
/* str.c -- strings to be used in the CoAP library
|
|
*
|
|
* Copyright (C) 2010,2011 Olaf Bergmann <bergmann@tzi.org>
|
|
*
|
|
* This file is part of the CoAP library libcoap. Please see
|
|
* README for terms of use.
|
|
*/
|
|
|
|
#include "coap_internal.h"
|
|
|
|
#include <stdio.h>
|
|
|
|
coap_string_t *coap_new_string(size_t size) {
|
|
coap_string_t *s;
|
|
#ifdef WITH_LWIP
|
|
if (size >= MEMP_LEN_COAPSTRING) {
|
|
coap_log(LOG_CRIT,
|
|
"coap_new_string: size too large (%zu +1 > MEMP_LEN_COAPSTRING)\n",
|
|
size);
|
|
return NULL;
|
|
}
|
|
#endif /* WITH_LWIP */
|
|
assert(size+1 != 0);
|
|
s = (coap_string_t *)coap_malloc_type(COAP_STRING,
|
|
sizeof(coap_string_t) + size + 1);
|
|
if ( !s ) {
|
|
coap_log(LOG_CRIT, "coap_new_string: malloc: failed\n");
|
|
return NULL;
|
|
}
|
|
|
|
memset(s, 0, sizeof(coap_string_t));
|
|
s->s = ((unsigned char *)s) + sizeof(coap_string_t);
|
|
s->s[size] = '\000';
|
|
s->length = size;
|
|
return s;
|
|
}
|
|
|
|
void coap_delete_string(coap_string_t *s) {
|
|
coap_free_type(COAP_STRING, s);
|
|
}
|
|
|
|
coap_str_const_t *coap_new_str_const(const uint8_t *data, size_t size) {
|
|
coap_string_t *s = coap_new_string(size);
|
|
if (!s)
|
|
return NULL;
|
|
memcpy (s->s, data, size);
|
|
s->length = size;
|
|
return (coap_str_const_t *)s;
|
|
}
|
|
|
|
void coap_delete_str_const(coap_str_const_t *s) {
|
|
coap_free_type(COAP_STRING, s);
|
|
}
|
|
|
|
coap_str_const_t *coap_make_str_const(const char *string)
|
|
{
|
|
static int ofs = 0;
|
|
static coap_str_const_t var[COAP_MAX_STR_CONST_FUNC];
|
|
if (++ofs == COAP_MAX_STR_CONST_FUNC) ofs = 0;
|
|
var[ofs].length = strlen(string);
|
|
var[ofs].s = (const uint8_t *)string;
|
|
return &var[ofs];
|
|
}
|
|
|
|
coap_binary_t *coap_new_binary(size_t size) {
|
|
return (coap_binary_t *)coap_new_string(size);
|
|
}
|
|
|
|
coap_binary_t *coap_resize_binary(coap_binary_t *s, size_t size) {
|
|
#if defined(RIOT_VERSION) || defined(WITH_CONTIKI) || defined(WITH_LWIP)
|
|
/* Unlikely to work as strings will not be large enough */
|
|
coap_binary_t *new = coap_new_binary(size);
|
|
if (new) {
|
|
memcpy(new->s, s->s, s->length);
|
|
coap_delete_binary(s);
|
|
}
|
|
#else /* ! RIOT_VERSION && ! WITH_CONTIKI && ! WITH_LWIP */
|
|
coap_binary_t *new = coap_realloc_type(COAP_STRING,
|
|
s,
|
|
sizeof(coap_binary_t) + size);
|
|
#endif /* ! RIOT_VERSION && ! WITH_CONTIKI && ! WITH_LWIP */
|
|
if (new) {
|
|
new->length = size;
|
|
new->s = ((unsigned char *)new) + sizeof(coap_string_t);
|
|
}
|
|
return new;
|
|
}
|
|
|
|
void coap_delete_binary(coap_binary_t *s) {
|
|
coap_free_type(COAP_STRING, s);
|
|
}
|
|
|
|
coap_bin_const_t *coap_new_bin_const(const uint8_t *data, size_t size) {
|
|
coap_string_t *s = coap_new_string(size);
|
|
if (!s)
|
|
return NULL;
|
|
memcpy (s->s, data, size);
|
|
s->length = size;
|
|
return (coap_bin_const_t *)s;
|
|
}
|
|
|
|
void coap_delete_bin_const(coap_bin_const_t *s) {
|
|
coap_free_type(COAP_STRING, s);
|
|
}
|
|
|