Added networking configuration screens. These still need testing.

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index c7b2af093332f5520777de5833fcd372ed0404aa..fff72b04deb8971b65b2b17f85a0ae2e879d237d 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -5,6 +5,7 @@ Sun Jan  3 20:05:31 EST 1999 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * Established that a one-to-one WebCit/Citadel correspondence will
          be required.  No big deal due to shared code segments.
        * Added "change password"
+       * Added networking configuration screens.  These still need testing.
 
 Thu Dec 31 21:53:20 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * Final cvs commit for 1998 (an awful year, I'm glad to see it over).

diff --git a/webcit/Makefile.in b/webcit/Makefile.in
index 9a9008c9a84261ccb67c65e2e01ebc0b74c2de1f..bbe64c88ad1be493bf39ef54230055b40f1da989 100644 (file)
--- a/webcit/Makefile.in
+++ b/webcit/Makefile.in
@@ -36,10 +36,10 @@ snprintf.o: snprintf.c
 
 webcit: webcit.o auth.o tcp_sockets.o mainmenu.o serv_func.o who.o \
        roomops.o tools.o messages.o userlist.o paging.o sysmsgs.o \
-       mime_parser.o graphics.o
+       mime_parser.o graphics.o netconf.o
        $(CC) webcit.o auth.o tcp_sockets.o mainmenu.o serv_func.o who.o \
        tools.o roomops.o messages.o userlist.o paging.o sysmsgs.o \
-       mime_parser.o graphics.o -o webcit
+       mime_parser.o graphics.o netconf.o -o webcit
 
 webcit.o: webcit.c webcit.h child.h
        $(CC) $(CFLAGS) $(DEFS) -c webcit.c
@@ -83,6 +83,9 @@ sysmsgs.o: sysmsgs.c webcit.h child.h
 mime_parser.o: mime_parser.c webcit.h child.h
        $(CC) $(CFLAGS) $(DEFS) -c mime_parser.c
 
+netconf.o: netconf.c webcit.h child.h
+       $(CC) $(CFLAGS) $(DEFS) -c netconf.c
+
 Makefile: $(srcdir)/Makefile.in config.status
        CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status
 

diff --git a/webcit/child.h b/webcit/child.h
index aa581034601f603b21d04cd9006bd727042466b6..9236f7273f7962876ed000ed4970f55c15b873a0 100644 (file)
--- a/webcit/child.h
+++ b/webcit/child.h
@@ -86,3 +86,13 @@ void display_reg(int);
 void register_user(void);
 void display_changepw(void);
 void changepw(void);
+void display_edit_node(void);
+void display_netconf(void);
+void display_confirm_unshare(void);
+void display_confirm_delete_node(void);
+void delete_node(void);
+void unshare(void);
+void display_add_node(void);
+void add_node(void);
+void display_share(void);
+void share(void);

diff --git a/webcit/netconf.c b/webcit/netconf.c
new file mode 100644 (file)
index 0000000..6fc58db
--- /dev/null
+++ b/webcit/netconf.c
@@ -0,0 +1,366 @@
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <ctype.h>
+#include <string.h>
+#include "webcit.h"
+#include "child.h"
+
+struct sharelist {
+       struct sharelist *next;
+       char shname[256];
+       };
+
+
+void display_edit_node(void) {
+       char buf[256];
+       char node[256];
+       char sroom[256];
+
+       strcpy(node, bstr("node"));
+
+       printf("HTTP/1.0 200 OK\n");
+       output_headers(1);
+       wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=000077><TR><TD>");
+       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
+       wprintf("<B>Edit share list for ");
+       escputs(node);
+       wprintf("</B>\n");
+       wprintf("</FONT></TD></TR></TABLE>\n");
+
+       wprintf("<CENTER>\n");
+       wprintf("<A HREF=\"/display_share&node=");
+       urlescputs(node);
+       wprintf("\">Add a shared room</A><BR>\n");
+
+       wprintf("<A HREF=\"/display_netconf");
+       wprintf("\">Return to network configuration screen</A><BR>\n");
+
+       serv_printf("NSET roomlist|%s", node);
+       serv_gets(buf);
+       if (buf[0] == '1') {
+               wprintf("<TABLE border=0>\n");
+               while (serv_gets(buf), strcmp(buf, "000")) {
+                       extract(sroom, buf, 0);
+                       wprintf("<TR><TD><FONT SIZE=+1>");
+                       escputs(sroom);
+                       wprintf("</FONT></TD>");
+                       wprintf("<TD><A HREF=\"/display_confirm_unshare&sroom=");
+                       urlescputs(sroom);
+                       wprintf("&node=");
+                       urlescputs(node);
+                       wprintf("\">(UnShare)</A></TD>");
+                       wprintf("</TR>\n");
+                       }
+               wprintf("</TABLE></CENTER>\n");
+               }
+       
+       wprintf("<HR></BODY></HTML>\n");
+       wDumpContent();
+       }
+       
+
+
+void display_netconf(void) {
+       char buf[256];
+       char node[256];
+
+       printf("HTTP/1.0 200 OK\n");
+       output_headers(1);
+       wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=770000><TR><TD>");
+       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
+       wprintf("<B>Network configuration</B>\n");
+       wprintf("</FONT></TD></TR></TABLE>\n");
+
+       wprintf("<CENTER>");
+       wprintf("<A HREF=\"/display_add_node\">");
+       wprintf("Add a new node</A><BR>\n");
+       wprintf("</CENTER>");
+
+       wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=000077><TR><TD>");
+       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
+       wprintf("<B>Currently configured nodes</B>\n");
+       wprintf("</FONT></TD></TR></TABLE>\n");
+       serv_puts("NSET nodelist");
+       serv_gets(buf);
+       if (buf[0] == '1') {
+               wprintf("<CENTER><TABLE border=0>\n");
+               while (serv_gets(buf), strcmp(buf, "000")) {
+                       extract(node, buf, 0);
+                       wprintf("<TR><TD><FONT SIZE=+1>");
+                       escputs(node);
+                       wprintf("</FONT></TD>");
+                       wprintf("<TD><A HREF=\"/display_edit_node&node=");
+                       urlescputs(node);
+                       wprintf("\">(Edit)</A></TD>");
+                       wprintf("<TD><A HREF=\"/display_confirm_delete_node&node=");
+                       urlescputs(node);
+                       wprintf("\">(Delete)</A></TD>");
+                       wprintf("</TR>\n");
+                       }
+               wprintf("</TABLE></CENTER>\n");
+               }
+       
+       wprintf("<HR></BODY></HTML>\n");
+       wDumpContent();
+       }
+
+
+void display_confirm_unshare(void) {
+       char node[256];
+       char sroom[256];
+
+       printf("HTTP/1.0 200 OK\n");
+       output_headers(1);
+       wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=770000><TR><TD>");
+       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
+       wprintf("<B>Confirm unshare</B>\n");
+       wprintf("</FONT></TD></TR></TABLE>\n");
+
+       strcpy(node, bstr("node"));
+       strcpy(sroom, bstr("sroom"));
+       wprintf("<CENTER>Are you sure you want to unshare <FONT SIZE=+1>");
+       escputs(sroom);
+       wprintf("</FONT>?<BR>\n");
+       wprintf("<A HREF=\"/unshare&node=");
+       urlescputs(node);
+       wprintf("&sroom=");
+       urlescputs(sroom);
+       wprintf("\">Yes</A>&nbsp;&nbsp;&nbsp;");
+       wprintf("<A HREF=\"/display_edit_node&node=");
+       urlescputs(node);
+       wprintf("\">No</A><BR></BODY></HTML>\n");
+       wDumpContent();
+       }
+
+
+void display_confirm_delete_node(void) {
+       char node[256];
+
+       printf("HTTP/1.0 200 OK\n");
+       output_headers(1);
+       wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=770000><TR><TD>");
+       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
+       wprintf("<B>Confirm delete</B>\n");
+       wprintf("</FONT></TD></TR></TABLE>\n");
+
+       strcpy(node, bstr("node"));
+       wprintf("<CENTER>Are you sure you want to delete <FONT SIZE=+1>");
+       escputs(node);
+       wprintf("</FONT>?<BR>\n");
+       wprintf("<A HREF=\"/delete_node&node=");
+       urlescputs(node);
+       wprintf("\">Yes</A>&nbsp;&nbsp;&nbsp;");
+       wprintf("<A HREF=\"/display_netconf\">No</A><BR>\n");
+       wprintf("</BODY></HTML>\n");
+       wDumpContent();
+       }
+
+
+void delete_node(void) {
+       char node[256];
+       char buf[256];
+       
+       strcpy(node, bstr("node"));
+       sprintf(buf, "NSET deletenode|%s", node);
+       serv_puts(buf);
+       serv_gets(buf);
+       if (buf[0]=='1') {
+               printf("HTTP/1.0 200 OK\n");
+               output_headers(1);
+               server_to_text();
+               wprintf("<A HREF=\"/display_netconf\">Back to menu</A>\n");
+               wprintf("</BODY></HTML>\n");
+               wDumpContent();
+               }
+       else {
+               display_error(&buf[4]);
+               }
+       }
+
+
+void unshare(void) {
+       char node[256];
+       char sroom[256];
+       char buf[256];
+       
+       strcpy(node, bstr("node"));
+       strcpy(sroom, bstr("sroom"));
+       sprintf(buf, "NSET unshare|%s|%s", node, sroom);
+       serv_puts(buf);
+       serv_gets(buf);
+       if (buf[0]=='1') {
+               printf("HTTP/1.0 200 OK\n");
+               output_headers(1);
+               server_to_text();
+               wprintf("<A HREF=\"/display_netconf\">Back to menu</A>\n");
+               wprintf("</BODY></HTML>\n");
+               wDumpContent();
+               }
+       else {
+               display_error(&buf[4]);
+               }
+       }
+
+
+
+void display_add_node(void) {
+       
+       printf("HTTP/1.0 200 OK\n");
+       output_headers(1);
+       wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=007700><TR><TD>");
+       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
+       wprintf("<B>Add a new node</B>\n");
+       wprintf("</FONT></TD></TR></TABLE>\n");
+
+       wprintf("<CENTER>");
+       wprintf("<FORM METHOD=\"POST\" ACTION=\"/add_node\">\n");
+
+       wprintf("Enter name of new node: ");
+       wprintf("<INPUT TYPE=\"text\" NAME=\"node\" MAXLENGTH=\"64\"><BR>\n");
+
+       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Add\">");
+       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
+
+       wprintf("</FORM></CENTER></BODY></HTML>\n");
+       wDumpContent();
+       }
+
+
+
+void add_node(void) {
+       char node[256];
+       char buf[256];
+       char sc[256];
+
+       strcpy(node, bstr("node"));
+       strcpy(sc, bstr("sc"));
+
+       if (!strcmp(sc, "Add")) {
+               sprintf(buf, "NSET addnode|%s", node);
+               serv_puts(buf);
+               serv_gets(buf);
+               if (buf[0]=='1') {
+                       printf("HTTP/1.0 200 OK\n");
+                       output_headers(1);
+                       server_to_text();
+                       wprintf("<A HREF=\"/display_netconf\">Back to menu</A>\n");
+                       wprintf("</BODY></HTML>\n");
+                       wDumpContent();
+                       }
+               else {
+                       display_error(&buf[4]);
+                       }
+               }
+
+       }
+
+
+
+void display_share(void) {
+       char buf[256];
+       char node[256];
+       char sroom[256];
+       struct sharelist *shlist = NULL;
+       struct sharelist *shptr;
+       int already_shared;
+
+       strcpy(node, bstr("node"));
+
+       printf("HTTP/1.0 200 OK\n");
+       output_headers(1);      
+       wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=007700><TR><TD>");
+       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
+       wprintf("<B>Add a shared room</B>\n");
+       wprintf("</FONT></TD></TR></TABLE>\n");
+
+       wprintf("<CENTER>");
+       wprintf("<FORM METHOD=\"POST\" ACTION=\"/share\">\n");
+       wprintf("<INPUT TYPE=\"hidden\" NAME=\"node\" VALUE=\"");
+       urlescputs(node);
+       wprintf("\">\n");
+
+       sprintf(buf, "NSET roomlist|%s", node);
+       serv_puts(buf);
+       serv_gets(buf);
+       if (buf[0]=='1') {
+               while(serv_gets(buf), strcmp(buf,"000")) {
+                       shptr = (struct sharelist *)
+                               malloc(sizeof(struct sharelist));
+                       shptr -> next = shlist;
+                       extract(shptr->shname, buf, 0);
+                       shlist = shptr;
+                       }
+               }
+
+       wprintf("<SELECT NAME=\"sroom\" SIZE=5 WIDTH=30>\n");
+       serv_puts("LKRA");
+       serv_gets(buf);
+       if (buf[0]=='1') {
+               while(serv_gets(buf), strcmp(buf,"000")) {
+                       extract(sroom, buf, 0);
+                       already_shared = 0;
+                       for (shptr = shlist; shptr != NULL; shptr = shptr->next) {
+                               if (!strcasecmp(sroom, shptr->shname))
+                                       already_shared = 1;
+                               }
+
+                       if (already_shared == 0) {
+                               wprintf("<OPTION>");
+                               escputs(sroom);
+                               wprintf("\n");
+                               }
+
+                       }
+               }
+       wprintf("</SELECT>\n");
+       wprintf("<BR>\n");
+
+       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Share\">");
+       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
+
+       wprintf("</FORM></CENTER></BODY></HTML>\n");
+       wDumpContent();
+
+       /* free the list */
+       while (shlist != NULL) {
+               shptr = shlist->next;
+               free(shlist);
+               shlist = shptr;
+               }
+
+       }
+
+
+
+void share(void) {
+       char node[256];
+       char buf[256];
+       char sc[256];
+       char sroom[256];
+       
+       strcpy(node, bstr("node"));
+       strcpy(sc, bstr("sc"));
+       strcpy(sroom, bstr("sroom"));
+
+       if (!strcmp(sc, "Share")) {
+               sprintf(buf, "NSET share|%s|%s", node, sroom);
+               serv_puts(buf);
+               serv_gets(buf);
+               if (buf[0]=='1') {
+                       printf("HTTP/1.0 200 OK\n");
+                       output_headers(1);
+                       server_to_text();
+                       wprintf("<A HREF=\"/display_netconf\">Back to menu</A>\n");
+                       wprintf("</BODY></HTML>\n");
+                       wDumpContent();
+                       }
+               else {
+                       display_error(&buf[4]);
+                       }
+
+               }
+       }
+

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 551b13c36340747bb58fda911ec5995b02ba121e..2f6798de27400732b97328aedf7e0d78148ce954 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -828,6 +828,46 @@ void session_loop(void) {
                changepw();
                }
 
+       else if (!strcasecmp(action, "display_edit_node")) {
+               display_edit_node();
+               }
+
+       else if (!strcasecmp(action, "display_netconf")) {
+               display_netconf();
+               }
+
+       else if (!strcasecmp(action, "display_confirm_unshare")) {
+               display_confirm_unshare();
+               }
+
+       else if (!strcasecmp(action, "display_confirm_delete_node")) {
+               display_confirm_delete_node();
+               }
+
+       else if (!strcasecmp(action, "delete_node")) {
+               delete_node();
+               }
+
+       else if (!strcasecmp(action, "unshare")) {
+               unshare();
+               }
+
+       else if (!strcasecmp(action, "display_add_node")) {
+               display_add_node();
+               }
+
+       else if (!strcasecmp(action, "add_node")) {
+               add_node();
+               }
+
+       else if (!strcasecmp(action, "display_share")) {
+               display_share();
+               }
+
+       else if (!strcasecmp(action, "share")) {
+               share();
+               }
+
        /* When all else fails... */
        else {
                printf("HTTP/1.0 200 OK\n");