Changeset 22

Timestamp:

03/13/04 18:06:02 (5 years ago)

Author:

minaguib

Message:

Renamed function auth to authenticate, moved it to new centralserver.c - let's try to keep stuff that talks to the central there

this frees up http.c to be full of only libhttpd handles and nothing else

Files:

• branches/incorporate_libhttpd/wifidog/src/Makefile.am (modified) (2 diffs)
• branches/incorporate_libhttpd/wifidog/src/centralserver.c (added)
• branches/incorporate_libhttpd/wifidog/src/centralserver.h (added)
• branches/incorporate_libhttpd/wifidog/src/common.h (modified) (1 diff)
• branches/incorporate_libhttpd/wifidog/src/firewall.c (modified) (1 diff)
• branches/incorporate_libhttpd/wifidog/src/http.c (modified) (2 diffs)
• branches/incorporate_libhttpd/wifidog/src/http.h (modified) (1 diff)

branches/incorporate_libhttpd/wifidog/src/Makefile.am

@@ -15 +15 @@
-        firewall.c \
-        gateway.c \
+        centralserver.c \
-        http.c 
-
@@ -24 +25 @@
-        firewall.h \
-        gateway.h \
+        centralserver.h \
-        http.h 
-

branches/incorporate_libhttpd/wifidog/src/common.h

@@ -51 +51 @@
-#include "cgi.h"
-#include "http.h"
+#include "centralserver.h"
-
-#include "httpd.h"

branches/incorporate_libhttpd/wifidog/src/firewall.c

@@ -196 +196 @@
-                } else {
-                    p1->counter = counter;
-
+enticate
-                        /* User has to be kicked out */
-                    }

branches/incorporate_libhttpd/wifidog/src/http.c

@@ -88 +88 @@
-            http_body(body, "I could not find your hardware address for your IP address %s, please report this error to the systems administrator", ip);
-        } else {
-
+enticate
-                /* Authentication succesful */
-                if (profile == 0) {
@@ -195 +195 @@
-}
-
-int
-auth(char *ip, char *mac, char *token, long int stats)
-{
-        int sockfd, numbytes;
-        char buf[MAX_BUF];
-        struct hostent *he;
-        struct sockaddr_in their_addr;
-        int profile;
-        char *p1;
-
-        if ((he = gethostbyname(config.authserv_hostname)) == NULL) {
-            debug(D_LOG_ERR, "gethostbyname(): %s", strerror(errno));
-            exit(1);
-        }
-
-        if ((sockfd = socket(AF_INET, SOCK_STREAM, 0)) == -1) {
-            debug(D_LOG_ERR, "socket(): %s", strerror(errno));
-            exit(1);
-        }
-
-        their_addr.sin_family = AF_INET;
-        their_addr.sin_port = htons(config.authserv_port);
-        their_addr.sin_addr = *((struct in_addr *)he->h_addr);
-        memset(&(their_addr.sin_zero), '\0', 8);
-
-        debug(D_LOG_DEBUG, "Connecting to auth server %s on port %d", config.authserv_hostname, config.authserv_port);
-
-        if (connect(sockfd, (struct sockaddr *)&their_addr, sizeof(struct sockaddr)) == -1) {
-            debug(D_LOG_ERR, "connect(): %s", strerror(errno));
-            exit(1);
-        }
-
-        sprintf(buf, "GET %s?ip=%s&mac=%s&token=%s&stats=%ld HTTP/1.1\nHost: %s\n\n", config.authserv_path, ip, mac, token, stats, config.authserv_hostname);
-        sock_send(sockfd, buf);
-
-        debug(D_LOG_DEBUG, "Sending HTTP request:\n#####\n%s\n#####", buf);
-        
-        if ((numbytes = recv(sockfd, buf, MAX_BUF - 1, 0)) == -1) {
-            debug(D_LOG_ERR, "recv(): %s", strerror(errno));
-            exit(1);
-        }
-
-        buf[numbytes] = '\0';
-
-        close(sockfd);
-
-        if ((p1 = strstr(buf, "Profile: "))) {
-            if (sscanf(p1, "Profile: %d", &profile) == 1) {
-                debug(D_LOG_DEBUG, "Auth server returned profile %d", profile);
-                return(profile);
-            } else {
-                debug(D_LOG_DEBUG, "Auth server did not return expected information");
-                return(-1);
-            }
-        } else {
-            return(-1);
-        }
-
-        close(sockfd);
-
-    return(-1);
-}
-

branches/incorporate_libhttpd/wifidog/src/http.h

@@ -33 +33 @@
-void sock_send(int sockfd, char *buffer);
-char *gmtdate();
-int auth(char *ip, char *mac, char *token, long int stats);
-
-#endif /* _HTTP_H_ */