* added matts date picker widget

[citadel.git] / webcit / cookie_conversion.c

diff --git a/webcit/cookie_conversion.c b/webcit/cookie_conversion.c
index 040eee612655f37fcc02d77be2fc1049ffcf041c..328d72fe1b7de149e141555cd61991a08e02d31c 100644 (file)
--- a/webcit/cookie_conversion.c
+++ b/webcit/cookie_conversion.c
@@ -6,6 +6,7 @@
  * Utility functions which convert the HTTP cookie format we use to and
  * from user/password/room strings.
  *
+ * \ingroup WebcitHttpServer 
  */
 /*@{*/
 #include "webcit.h"
@@ -25,36 +26,39 @@ typedef unsigned char byte;       /**< Byte type */
  * \param pass his passphrase
  * \param room the room he wants to enter
  */
-void stuff_to_cookie(char *cookie, int session,
+void stuff_to_cookie(char *cookie, size_t clen, int session,
                char *user, char *pass, char *room)
 {
        char buf[SIZ];
        int i;
+       int len;
 
-       sprintf(buf, "%d|%s|%s|%s|", session, user, pass, room);
+       len = snprintf(buf, SIZ, "%d|%s|%s|%s|", session, user, pass, room);
        strcpy(cookie, "");
-       for (i=0; i<strlen(buf); ++i) {
-               sprintf(&cookie[i*2], "%02X", buf[i]);
+       for (i=0; i<len; ++i) {
+               snprintf(&cookie[i*2], clen - i * 2, "%02X", buf[i]);
        }
 }
 
 /**
- * \brief some bytefoo ????
- * \param in the string to chop
- * \param len the length of the string
- * \return the corrosponding integer value
+ * \brief      Convert unpacked hex string to an integer
+ * \param      in      Input hex string
+ * \param      len     the length of the string
+ * \return     the corrosponding integer value
  */
 int xtoi(char *in, size_t len)
 {
-    int val = 0;
-    while (isxdigit((byte) *in) && (len-- > 0)) {
-       char c = *in++;
-       val <<= 4;
-       val += isdigit((unsigned char)c)
-           ? (c - '0')
-           : (tolower((unsigned char)c) - 'a' + 10);
-    }
-    return val;
+       int val = 0;
+       char c = 0;
+       while (isxdigit((byte) *in) && (len-- > 0))
+       {
+               c = *in++;
+               val <<= 4;
+               val += isdigit((unsigned char)c)
+               ? (c - '0')
+               : (tolower((unsigned char)c) - 'a' + 10);
+       }
+       return val;
 }
 
 /**
@@ -83,6 +87,18 @@ void cookie_to_stuff(char *cookie, int *session,
                buf[i+1] = 0;
        }
 
+/* debug
+       char t[256];
+       extract_token(t, buf, 0, '|', sizeof t);
+       lprintf(9, "SESS: %s\n", t);
+       extract_token(t, buf, 1, '|', sizeof t);
+       lprintf(9, "USER: %s\n", t);
+       extract_token(t, buf, 2, '|', sizeof t);
+       lprintf(9, "PASS: %s\n", t);
+       extract_token(t, buf, 3, '|', sizeof t);
+       lprintf(9, "ROOM: %s\n", t);
+ debug */
+
        if (session != NULL)
                *session = extract_int(buf, 0);
        if (user != NULL)