X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=radsecproxy.h;h=09b5d6e25685db2b9c5eb1a4c8bbf28a84d15b34;hb=c1f196080a7cb867afd3dee50e2910899cbf5f46;hp=8c17c96dec046d01ec02e41933d9c07ec1633bad;hpb=e153afc401ccb9256385a0a3da10bf412d87fe1f;p=libradsec.git diff --git a/radsecproxy.h b/radsecproxy.h index 8c17c96..09b5d6e 100644 --- a/radsecproxy.h +++ b/radsecproxy.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2008 Stig Venaas + * Copyright (C) 2006-2009 Stig Venaas * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -8,8 +8,9 @@ #include "tlv11.h" #include "radmsg.h" +#include "gconfig.h" -#define DEBUG_LEVEL 3 +#define DEBUG_LEVEL 2 #define CONFIG_MAIN "/etc/radsecproxy.conf" @@ -22,35 +23,40 @@ #define STATUS_SERVER_PERIOD 25 #define IDLE_TIMEOUT 300 +/* 27262 is vendor DANTE Ltd. */ +#define DEFAULT_TTL_ATTR "27262:1" + #define RAD_UDP 0 #define RAD_TLS 1 #define RAD_TCP 2 #define RAD_DTLS 3 +#define RAD_PROTOCOUNT 4 struct options { - char **listenudp; - char **listentcp; - char **listentls; - char **listendtls; - char **listenaccudp; - char *sourceudp; - char *sourcetcp; - char *sourcetls; - char *sourcedtls; char *logdestination; + char *ttlattr; + uint32_t ttlattrtype[2]; + uint8_t addttl; uint8_t loglevel; uint8_t loopprevention; }; +struct commonprotoopts { + char **listenargs; + char *sourcearg; +}; + struct request { struct timeval created; - uint8_t refcount; + uint32_t refcount; uint8_t *buf, *replybuf; struct radmsg *msg; struct client *from; + struct server *to; char *origusername; uint8_t rqid; uint8_t rqauth[16]; + uint8_t newid; int udpsock; /* only for UDP */ uint16_t udpport; /* only for UDP */ }; @@ -63,7 +69,7 @@ struct rqout { struct timeval expiry; }; -struct queue { +struct gqueue { struct list *entries; pthread_mutex_t mutex; pthread_cond_t cond; @@ -73,8 +79,9 @@ struct clsrvconf { char *name; uint8_t type; /* RAD_UDP/RAD_TLS/RAD_TCP */ const struct protodefs *pdef; - char *host; - char *port; + char **hostsrc; + char *portsrc; + struct list *hostports; char *secret; char *tls; char *matchcertattr; @@ -90,24 +97,27 @@ struct clsrvconf { uint8_t retrycount; uint8_t dupinterval; uint8_t certnamecheck; - SSL_CTX *ssl_ctx; + uint8_t addttl; + uint8_t loopprevention; struct rewrite *rewritein; struct rewrite *rewriteout; - struct addrinfo *addrinfo; - uint8_t prefixlen; pthread_mutex_t *lock; /* only used for updating clients so far */ + struct tls *tlsconf; struct list *clients; struct server *servers; }; +#include "rsp_tlscommon.h" + struct client { struct clsrvconf *conf; int sock; SSL *ssl; struct request *rqs[MAX_REQUESTS]; - struct queue *replyq; - struct queue *rbios; /* for dtls */ + struct gqueue *replyq; + struct gqueue *rbios; /* for dtls */ struct sockaddr *addr; + time_t expiry; /* for udp */ }; struct server { @@ -121,6 +131,7 @@ struct server { struct timeval lastreply; uint8_t connectionok; uint8_t lostrqs; + uint8_t dynstartup; char *dynamiclookuparg; int nextid; struct timeval lastrcv; @@ -128,7 +139,7 @@ struct server { uint8_t newrq; pthread_mutex_t newrq_mutex; pthread_cond_t newrq_cond; - struct queue *rbios; /* for dtls */ + struct gqueue *rbios; /* for dtls */ }; struct realm { @@ -136,24 +147,14 @@ struct realm { char *message; uint8_t accresp; regex_t regex; - pthread_mutex_t subrealms_mutex; + uint32_t refcount; + pthread_mutex_t mutex; + struct realm *parent; struct list *subrealms; struct list *srvconfs; struct list *accsrvconfs; }; -struct tls { - char *name; - char *cacertfile; - char *cacertpath; - char *certfile; - char *certkeyfile; - char *certkeypwd; - uint8_t crlcheck; - SSL_CTX *tlsctx; - SSL_CTX *dtlsctx; -}; - struct modattr { uint8_t t; char *replacement; @@ -170,20 +171,22 @@ struct rewrite { struct protodefs { char *name; char *secretdefault; - uint8_t socktype; + int socktype; char *portdefault; uint8_t retrycountdefault; uint8_t retrycountmax; uint8_t retryintervaldefault; uint8_t retryintervalmax; uint8_t duplicateintervaldefault; + void (*setprotoopts)(struct commonprotoopts *); + char **(*getlistenerargs)(); void *(*listener)(void*); - char **srcaddrport; int (*connecter)(struct server *, struct timeval *, int, char *); void *(*clientconnreader)(void*); int (*clientradput)(struct server *, unsigned char *); void (*addclient)(struct client *); void (*addserverextra)(struct clsrvconf *); + void (*setsrcres)(); void (*initextra)(); }; @@ -194,21 +197,20 @@ struct protodefs { #define ATTRVAL(x) ((x) + 2) #define ATTRVALLEN(x) ((x)[1] - 2) -struct addrinfo *getsrcprotores(uint8_t type); struct clsrvconf *find_clconf(uint8_t type, struct sockaddr *addr, struct list_node **cur); struct clsrvconf *find_srvconf(uint8_t type, struct sockaddr *addr, struct list_node **cur); struct clsrvconf *find_clconf_type(uint8_t type, struct list_node **cur); struct client *addclient(struct clsrvconf *conf, uint8_t lock); +void removelockedclient(struct client *client); void removeclient(struct client *client); -void removeclientrqs(struct client *client); -struct queue *newqueue(); -void removequeue(struct queue *q); -void freebios(struct queue *q); +struct gqueue *newqueue(); +void freebios(struct gqueue *q); struct request *newrequest(); void freerq(struct request *rq); int radsrv(struct request *rq); -X509 *verifytlscert(SSL *ssl); -int verifyconfcert(X509 *cert, struct clsrvconf *conf); void replyh(struct server *server, unsigned char *buf); -int connecttcp(struct addrinfo *addrinfo, struct addrinfo *src); -int bindtoaddr(struct addrinfo *addrinfo, int family, int reuse, int v6only); +struct addrinfo *resolve_hostport_addrinfo(uint8_t type, char *hostport); + +/* Local Variables: */ +/* c-file-style: "stroustrup" */ +/* End: */