moved genericconfig to gconfig.c and reorganised header files

[radsecproxy.git] / radsecproxy.h

diff --git a/radsecproxy.h b/radsecproxy.h
index 7332ae4..ee321f8 100644 (file)
--- a/radsecproxy.h
+++ b/radsecproxy.h
@@ -38,14 +38,12 @@
 #define RAD_VS_ATTR_MS_MPPE_Send_Key 16
 #define RAD_VS_ATTR_MS_MPPE_Recv_Key 17
 
-#define CONF_STR 1
-#define CONF_CBK 2
-#define CONF_MSTR 3
-
 struct options {
     char *listenudp;
     char *listentcp;
     char *listenaccudp;
+    char *sourceudp;
+    char *sourcetcp;
     char *logdestination;
     uint8_t loglevel;
 };
@@ -57,6 +55,7 @@ struct request {
     uint8_t received;
     struct timeval expiry;
     struct client *from;
+    char *origusername;
     uint8_t origid; /* used by servwr */
     char origauth[16]; /* used by servwr */
     struct sockaddr_storage fromsa; /* used by udpservwr */
@@ -137,9 +136,3 @@ struct tls {
 #define SOCKADDR_SIZE(addr) ((addr).ss_family == AF_INET ? \
                             sizeof(struct sockaddr_in) : \
                             sizeof(struct sockaddr_in6))
-
-char *stringcopy(char *s, int len);
-char *addr2string(struct sockaddr *addr, socklen_t len);
-void printfchars(char *prefixfmt, char *prefix, char *charfmt, char *chars, int len);
-int bindport(int type, char *port);
-int connectport(int type, char *host, char *port);