ip/ipconfig: simplify by combining mklladdr() into mkclientid()

[plan9front.git] / sys / src / libauthsrv / convM2TR.c

diff --git a/sys/src/libauthsrv/convM2TR.c b/sys/src/libauthsrv/convM2TR.c
index ffad75c771e757f999ebe8773e513a3893b0a0cf..79749873c8ba76eaa4561f38c1ee156b5be040ff 100644 (file)
--- a/sys/src/libauthsrv/convM2TR.c
+++ b/sys/src/libauthsrv/convM2TR.c
@@ -2,27 +2,28 @@
 #include <libc.h>
 #include <authsrv.h>
 
-#define        CHAR(x)         f->x = *p++
-#define        SHORT(x)        f->x = (p[0] | (p[1]<<8)); p += 2
-#define        VLONG(q)        q = (p[0] | (p[1]<<8) | (p[2]<<16) | (p[3]<<24)); p += 4
-#define        LONG(x)         VLONG(f->x)
-#define        STRING(x,n)     memmove(f->x, p, n); p += n
-
-void
-convM2TR(char *ap, Ticketreq *f)
+int
+convM2TR(char *ap, int n, Ticketreq *f)
 {
        uchar *p;
 
+       memset(f, 0, sizeof(Ticketreq));
+       if(n < TICKREQLEN)
+               return -TICKREQLEN;
+
        p = (uchar*)ap;
-       CHAR(type);
-       STRING(authid, ANAMELEN);
+       f->type = *p++;
+       memmove(f->authid, p, ANAMELEN), p += ANAMELEN;
+       memmove(f->authdom, p, DOMLEN), p += DOMLEN;
+       memmove(f->chal, p, CHALLEN), p += CHALLEN;
+       memmove(f->hostid, p, ANAMELEN), p += ANAMELEN;
+       memmove(f->uid, p, ANAMELEN), p += ANAMELEN;
+
        f->authid[ANAMELEN-1] = 0;
-       STRING(authdom, DOMLEN);
        f->authdom[DOMLEN-1] = 0;
-       STRING(chal, CHALLEN);
-       STRING(hostid, ANAMELEN);
        f->hostid[ANAMELEN-1] = 0;
-       STRING(uid, ANAMELEN);
        f->uid[ANAMELEN-1] = 0;
-       USED(p);
+       n = p - (uchar*)ap;
+
+       return n;
 }