Author: tjansen Date: Tue Oct 27 18:05:29 2009 New Revision: 1362 Log: Removed obsolete token.{c,h}. Deleted: trunk/include/token.h trunk/libpisa/token.c Modified: trunk/include/global.h trunk/include/packet.h trunk/libpisa/Makefile.am trunk/pisasd/sdctx.h Modified: trunk/include/global.h ============================================================================== --- trunk/include/global.h Tue Oct 27 17:56:14 2009 (r1361) +++ trunk/include/global.h Tue Oct 27 18:05:29 2009 (r1362) @@ -238,8 +238,6 @@ typedef uint16_t pisa_tlv_type; typedef uint16_t pisa_tlv_len; typedef uint16_t pisa_packet_flags; -typedef char pisa_token[PISA_TOKEN_LENGTH+1]; -typedef char pisa_token_hash[PISA_HASH_LENGTH+1]; typedef char pisa_generic_hash[PISA_HASH_LENGTH+1]; typedef char pisa_cert[PISA_CERT_LENGTH+1]; typedef char pisa_ssid[MAX_SSID+1]; Modified: trunk/include/packet.h ============================================================================== --- trunk/include/packet.h Tue Oct 27 17:56:14 2009 (r1361) +++ trunk/include/packet.h Tue Oct 27 18:05:29 2009 (r1362) @@ -17,14 +17,15 @@ #include <unistd.h> #include <assert.h> #include <string.h> +#include <stdlib.h> #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> +#include "debug.h" #include "global.h" #include "crypto.h" -#include "token.h" #define PISA_TYPE_MASK 0xff00 #define PISA_PKTTYPE_TUN 0x0000 Modified: trunk/libpisa/Makefile.am ============================================================================== --- trunk/libpisa/Makefile.am Tue Oct 27 17:56:14 2009 (r1361) +++ trunk/libpisa/Makefile.am Tue Oct 27 18:05:29 2009 (r1362) @@ -6,7 +6,7 @@ lib_LTLIBRARIES = libpisa.la libpisa_la_SOURCES = arp.c config.c conmgr.c crypto.c libpisa_la_SOURCES += ctrlhandler.c debug.c hitlist.c linkedlist.c -libpisa_la_SOURCES += nat.c packet.c socket.c token.c tunnel.c util.c +libpisa_la_SOURCES += nat.c packet.c socket.c tunnel.c util.c libpisa_la_SOURCES += pisaconf.c scheduler.c if PISA_LOGGING libpisa_la_SOURCES += log.c Modified: trunk/pisasd/sdctx.h ============================================================================== --- trunk/pisasd/sdctx.h Tue Oct 27 17:56:14 2009 (r1361) +++ trunk/pisasd/sdctx.h Tue Oct 27 18:05:29 2009 (r1362) @@ -18,7 +18,6 @@ #include "global.h" #include "linkedlist.h" #include "nat.h" -#include "token.h" /** * data structure containing all of the necessary information about the