From c6473cacf4ac02db707c774d564c18ab3e8e9920 Mon Sep 17 00:00:00 2001 From: Olaf Bergmann Date: Wed, 14 Mar 2012 17:09:59 +0100 Subject: [PATCH] improved encoding of zero-length options --- encode.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/encode.c b/encode.c index f42a3fbd..b034b6bb 100644 --- a/encode.c +++ b/encode.c @@ -32,15 +32,17 @@ coap_decode_var_bytes(unsigned char *buf,unsigned int len) { unsigned int coap_encode_var_bytes(unsigned char *buf, unsigned int val) { - int n, i = val >> 1; - for (n = 0; i; n++) /* FIXME: coap_fls() */ - i >>= 1; + unsigned int n, i; - for (i = n / 8 + 1; i; --i) { - buf[i-1] = val & 0xff; + for (n = 0, i = val; i && n < sizeof(val); ++n) + i >>= 8; + + i = n; + while (i--) { + buf[i] = val & 0xff; val >>= 8; } - return n / 8 + 1; + return n; }