Bug fix and updates

apps/rest-common/rest-util.c

@@ -1,14 +1,9 @@
-/*
- * rest-util.c
- *
- *  Created on: Oct 26, 2010
- *      Author: dogan
- */
-
 #include <stddef.h> /*for size_t*/
 #include <ctype.h> /*for isxdigit*/
 #include <string.h>
 
+#include "contiki-net.h"
+
 /*Copied from mangoose http server*/
 size_t
 decode(const char *src, size_t srclen, char *dst, size_t dstlen, int is_form)
@@ -50,18 +45,15 @@ get_variable(const char *name, const char *buffer, size_t buflen, char* output,
   var_len = strlen(name);
   end = buffer + buflen;
 
-  for (start = buffer; start + var_len < end; start++)
-  {
+  for (start = buffer; start + var_len < end; start++){
     if ((start == buffer || start[-1] == '&') && start[var_len] == '=' &&
-        ! strncmp(name, start, var_len))
-    {
+        ! strncmp(name, start, var_len)) {
       /* Point p to variable value */
       start += var_len + 1;
 
       /* Point s to the end of the value */
       end_of_value = (const char *) memchr(start, '&', end - start);
-      if (end_of_value == NULL)
-      {
+      if (end_of_value == NULL) {
         end_of_value = end;
       }
 
@@ -71,3 +63,56 @@ get_variable(const char *name, const char *buffer, size_t buflen, char* output,
 
   return 0;
 }
+
+uint32_t
+read_int(uint8_t *buf, uint8_t size)
+{
+  uint32_t data = 0;
+
+  if (size >= 1 && size <= 4) {
+    uint8_t *p = (uint8_t *)&data;
+    memcpy(p + 4 - size, buf, size);
+  }
+
+  return uip_ntohl(data);
+}
+
+
+int
+write_int(uint8_t *buf, uint32_t data, uint8_t size)
+{
+  int success = 0;
+
+  if (size >= 1 && size <= 4) {
+    data = uip_htonl(data);
+    memcpy(buf, ((char*)(&data)) + 4 - size, size);
+    success = size;
+  }
+
+  return success;
+}
+
+int
+write_variable_int(uint8_t *buf, uint32_t data)
+{
+  uint8_t size = 4;
+  if (data <= 0xFF) {
+    size = 1;
+  } else if (data <= 0xFFFF) {
+    size = 2;
+  } else if (data <= 0xFFFFFF) {
+    size = 3;
+  }
+  return write_int(buf, data, size);
+}
+
+uint16_t log_2(uint16_t value)
+{
+  uint16_t result = 0;
+  do {
+    value = value >> 1;
+    result++;
+  } while (value);
+
+  return result ? result - 1 : result;
+}