}
+#ifdef WITH_ZLIB
+
+ssize_t http_write(int fd, const void *buf, size_t count) {
+
+ if (WC->gzfd) {
+ return gzwrite(WC->gzfd, buf, count);
+ }
+ else {
+ return write(fd, buf, count);
+ }
+
+
+}
+
+#else
+
+ssize_t http_write(int fd, const void *buf, size_t count) {
+ return write(fd, buf, count);
+}
+
+#endif
+
+
+
+
void wprintf(const char *format,...)
{
va_list arg_ptr;
vsprintf(wbuf, format, arg_ptr);
va_end(arg_ptr);
- write(WC->http_sock, wbuf, strlen(wbuf));
+ http_write(WC->http_sock, wbuf, strlen(wbuf));
}
int suppress_check = 0;
char httpnow[SIZ];
static int pageseq = 0;
+#ifdef WITH_ZLIB
+ gzFile temp_gzfd = NULL;
+#endif
print_standard_html_head = controlcode & 0x03;
refresh30 = ((controlcode & 0x04) >> 2);
httpdate(httpnow, time(NULL));
+#ifdef WITH_ZLIB
+ if (WC->gzcompressed) {
+ temp_gzfd = gzdopen(WC->http_sock, "wb9");
+ }
+#endif
+
if (print_standard_html_head > 0) {
wprintf("Content-type: text/html\n");
wprintf("Server: %s\n", SERVER);
wprintf("Connection: close\n");
wprintf("Pragma: no-cache\n");
wprintf("Cache-Control: no-store\n");
+#ifdef WITH_ZLIB
+ if (temp_gzfd != NULL) {
+ wprintf("Content-Encoding: gzip\n");
+ }
+#endif
}
stuff_to_cookie(cookie, WC->wc_session, WC->wc_username,
WC->wc_password, WC->wc_roomname);
if (print_standard_html_head > 0) {
wprintf("\n");
+
+#ifdef WITH_ZLIB
+ if (temp_gzfd != NULL) {
+ WC->gzfd = temp_gzfd;
+ }
+#endif
+
wprintf("<HTML><HEAD><TITLE>");
escputs(serv_info.serv_humannode);
wprintf("</TITLE>\n"
bigbuffer = malloc(bytes);
fread(bigbuffer, bytes, 1, fp);
fclose(fp);
- write(WC->http_sock, bigbuffer, bytes);
+ http_write(WC->http_sock, bigbuffer, bytes);
free(bigbuffer);
}
if (!strcasecmp(bstr("force_close_session"), "yes")) {
else {
memset(xferbuf, 0, thisblock);
}
- write(WC->http_sock, xferbuf, thisblock);
+ http_write(WC->http_sock, xferbuf, thisblock);
bytes = bytes - thisblock;
accomplished = accomplished + thisblock;
}
else {
memset(xferbuf, 0, thisblock);
}
- write(WC->http_sock, xferbuf, thisblock);
+ http_write(WC->http_sock, xferbuf, thisblock);
bytes = bytes - thisblock;
accomplished = accomplished + thisblock;
}
/*
* Entry point for WebCit transaction
*/
-void session_loop(struct httprequest *req)
+void session_loop(struct httprequest *req, int gzip)
{
char cmd[SIZ];
char action[SIZ];
WC->is_wap = 0;
+ if (gzip) {
+ WC->gzcompressed = 1;
+ }
+ else {
+ WC->gzcompressed = 0;
+ }
+
hptr = req;
if (hptr == NULL) return;
ContentLength = atoi(&buf[16]);
}
else if (!strncasecmp(buf, "Content-type: ", 14)) {
- strcpy(ContentType, &buf[14]);
+ safestrncpy(ContentType, &buf[14], sizeof ContentType);
}
else if (!strncasecmp(buf, "User-agent: ", 12)) {
- strcpy(user_agent, &buf[12]);
+ safestrncpy(user_agent, &buf[12], sizeof user_agent);
+ }
+ else if (!strncasecmp(buf, "Host: ", 6)) {
+ safestrncpy(WC->http_host, &buf[6], sizeof WC->http_host);
}
/* Only WAP gateways explicitly name this content-type */
else if (strstr(buf, "text/vnd.wap.wml")) {
}
}
+ /*
+ * Functions which can be performed without logging in
+ */
+ if (!strcasecmp(action, "listsub")) {
+ do_listsub();
+ goto SKIP_ALL_THIS_CRAP;
+ }
+
check_for_express_messages();
/*
output_static(buf);
} else if (!strcasecmp(action, "image")) {
output_image();
+
+ /*
+ * All functions handled below this point ... make sure we log in
+ * before doing anything else!
+ */
} else if ((!WC->logged_in) && (!strcasecmp(action, "login"))) {
do_login();
} else if (!WC->logged_in) {
display_login(NULL);
}
- /* Various commands... */
+
+ /*
+ * Various commands...
+ */
else if (!strcasecmp(action, "do_welcome")) {
do_welcome();
"/editroompic");
} else if (!strcasecmp(action, "editroompic")) {
do_graphics_upload("UIMG 1|_roompic_");
- } else if (!strcasecmp(action, "select_floor_to_edit_pic")) {
- select_floor_to_edit_pic();
} else if (!strcasecmp(action, "delete_floor")) {
delete_floor();
} else if (!strcasecmp(action, "rename_floor")) {
change_start_page();
} else if (!strcasecmp(action, "display_floorconfig")) {
display_floorconfig(NULL);
+ } else if (!strcasecmp(action, "toggle_self_service")) {
+ toggle_self_service();
+ } else if (!strcasecmp(action, "summary")) {
+ summary();
} else if (!strcasecmp(action, "diagnostics")) {
output_headers(1);
free(WC->upload);
WC->upload_length = 0;
}
+
+#ifdef WITH_ZLIB
+ if (WC->gzfd) {
+ gzclose(WC->gzfd);
+ WC->gzfd = NULL;
+ WC->gzcompressed = 0;
+ }
+#endif
}