X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fnetconf.c;h=83c391429c95aa0d7a4b10fed5706fa6facda289;hb=HEAD;hp=eaf0e9606ae44e9071a64363630e0da34fa4a8f3;hpb=4d688600d21df7ba1f96e0752b72285325ef0c80;p=citadel.git diff --git a/webcit/netconf.c b/webcit/netconf.c index eaf0e9606..6ff53fa56 100644 --- a/webcit/netconf.c +++ b/webcit/netconf.c @@ -1,359 +1,296 @@ -#include -#include -#include -#include -#include -#include -#include -#include "webcit.h" -#include "child.h" +// Copyright (c) 1999-2004 by the citadel.org team +// This program is open source software. Use, duplication, or disclosure is subject to the GNU General Public License v3. -struct sharelist { - struct sharelist *next; - char shname[256]; - }; +#include "webcit.h" -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, "bottom"); - wprintf("
"); - wprintf("Edit share list for "); - escputs(node); - wprintf("\n"); - wprintf("
\n"); - - wprintf("
\n"); - wprintf("Add a shared room
\n"); - - wprintf("Return to network configuration screen
\n"); - - serv_printf("NSET roomlist|%s", node); - serv_gets(buf); +void display_netconf(void); + +CtxType CTX_NODECONF = CTX_NONE; +/*----------------------------------------------------------------------*/ +/* Business Logic */ +/*----------------------------------------------------------------------*/ + +typedef struct _nodeconf { + int DeleteMe; + StrBuf *NodeName; + StrBuf *Secret; + StrBuf *Host; + StrBuf *Port; +} NodeConf; + +void DeleteNodeConf(void *vNode) { + NodeConf *Node = (NodeConf*) vNode; + FreeStrBuf(&Node->NodeName); + FreeStrBuf(&Node->Secret); + FreeStrBuf(&Node->Host); + FreeStrBuf(&Node->Port); + free(Node); +} + +NodeConf *NewNode(StrBuf *SerializedNode) { + NodeConf *Node; + + if (StrLength(SerializedNode) < 8) + return NULL; /* we need at least 4 pipes and some other text so its invalid. */ + Node = (NodeConf *) malloc(sizeof(NodeConf)); + Node->DeleteMe = 0; + Node->NodeName=NewStrBuf(); + StrBufExtract_token(Node->NodeName, SerializedNode, 0, '|'); + Node->Secret=NewStrBuf(); + StrBufExtract_token(Node->Secret, SerializedNode, 1, '|'); + Node->Host=NewStrBuf(); + StrBufExtract_token(Node->Host, SerializedNode, 2, '|'); + Node->Port=NewStrBuf(); + StrBufExtract_token(Node->Port, SerializedNode, 3, '|'); + return Node; +} + +NodeConf *HttpGetNewNode(void) { + NodeConf *Node; + + if (!havebstr("node") || + !havebstr("secret")|| + !havebstr("host")|| + !havebstr("port")) + return NULL; + + Node = (NodeConf *) malloc(sizeof(NodeConf)); + Node->DeleteMe = 0; + Node->NodeName = NewStrBufDup(sbstr("node")); + Node->Secret = NewStrBufDup(sbstr("secret")); + Node->Host = NewStrBufDup(sbstr("host")); + Node->Port = NewStrBufDup(sbstr("port")); + return Node; +} + +void SerializeNode(NodeConf *Node, StrBuf *Buf) { + StrBufPrintf(Buf, "%s|%s|%s|%s", + ChrPtr(Node->NodeName), + ChrPtr(Node->Secret), + ChrPtr(Node->Host), + ChrPtr(Node->Port)); +} + + +HashList *load_netconf(StrBuf *Target, WCTemplputParams *TP) { + StrBuf *Buf; + HashList *Hash; + char nnn[64]; + char buf[SIZ]; + int nUsed; + NodeConf *Node; + + serv_puts("CONF getsys|application/x-citadel-ignet-config"); + serv_getln(buf, sizeof buf); if (buf[0] == '1') { - wprintf("\n"); - while (serv_gets(buf), strcmp(buf, "000")) { - extract(sroom, buf, 0); - wprintf(""); - wprintf(""); - wprintf("\n"); + Hash = NewHash(1, NULL); + + Buf = NewStrBuf(); + while (StrBuf_ServGetln(Buf), strcmp(ChrPtr(Buf), "000")) { + Node = NewNode(Buf); + if (Node != NULL) { + nUsed = GetCount(Hash); + nUsed = snprintf(nnn, sizeof(nnn), "%d", nUsed+1); + Put(Hash, nnn, nUsed, Node, DeleteNodeConf); } - wprintf("
"); - escputs(sroom); - wprintf("(UnShare)
\n"); } - - wDumpContent(1); + FreeStrBuf(&Buf); + return Hash; } - - - -void display_netconf(void) { - char buf[256]; - char node[256]; - - printf("HTTP/1.0 200 OK\n"); - output_headers(1, "bottom"); - wprintf("
"); - wprintf("Network configuration\n"); - wprintf("
\n"); - - wprintf("
"); - wprintf(""); - wprintf("Add a new node
\n"); - wprintf("
"); - - wprintf("
"); - wprintf("Currently configured nodes\n"); - wprintf("
\n"); - serv_puts("NSET nodelist"); - serv_gets(buf); - if (buf[0] == '1') { - wprintf("
\n"); - while (serv_gets(buf), strcmp(buf, "000")) { - extract(node, buf, 0); - wprintf(""); - wprintf(""); - wprintf(""); - wprintf("\n"); + return NULL; +} + + + +void save_net_conf(HashList *Nodelist) { + char buf[SIZ]; + StrBuf *Buf; + HashPos *where; + void *vNode; + NodeConf *Node; + const char *Key; + long KeyLen; + + serv_puts("CONF putsys|application/x-citadel-ignet-config"); + serv_getln(buf, sizeof buf); + if (buf[0] == '4') { + if ((Nodelist != NULL) && (GetCount(Nodelist) > 0)) { + where = GetNewHashPos(Nodelist, 0); + Buf = NewStrBuf(); + while (GetNextHashPos(Nodelist, where, &KeyLen, &Key, &vNode)) { + Node = (NodeConf*) vNode; + if (Node->DeleteMe==0) { + SerializeNode(Node, Buf); + serv_putbuf(Buf); + } } - wprintf("
"); - escputs(node); - wprintf("(Edit)(Delete)
\n"); + FreeStrBuf(&Buf); + DeleteHashPos(&where); } - - wDumpContent(1); + serv_puts("000"); } +} -void display_confirm_unshare(void) { - char node[256]; - char sroom[256]; - - printf("HTTP/1.0 200 OK\n"); - output_headers(1, "bottom"); - wprintf("
"); - wprintf("Confirm unshare\n"); - wprintf("
\n"); - - strcpy(node, bstr("node")); - strcpy(sroom, bstr("sroom")); - wprintf("
Are you sure you want to unshare "); - escputs(sroom); - wprintf("?
\n"); - wprintf("Yes   "); - wprintf("No
\n"); - wDumpContent(1); - } +/*----------------------------------------------------------------------*/ +/* WEB Handlers */ +/*----------------------------------------------------------------------*/ -void display_confirm_delete_node(void) { - char node[256]; - - printf("HTTP/1.0 200 OK\n"); - output_headers(1, "bottom"); - wprintf("
"); - wprintf("Confirm delete\n"); - wprintf("
\n"); - - strcpy(node, bstr("node")); - wprintf("
Are you sure you want to delete "); - escputs(node); - wprintf("?
\n"); - wprintf("Yes   "); - wprintf("No
\n"); - wDumpContent(1); - } -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, "bottom"); - server_to_text(); - wprintf("Back to menu\n"); - wDumpContent(1); - } - else { - display_error(&buf[4]); - } - } +/* + * edit a network node + */ +void edit_node(void) { + HashList *NodeConfig; + const StrBuf *Index; + NodeConf *NewNode; - -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, "bottom"); - server_to_text(); - wprintf("Back to menu\n"); - wDumpContent(1); - } - else { - display_error(&buf[4]); + if (havebstr("ok_button")) { + Index = sbstr("index"); + NewNode = HttpGetNewNode(); + if ((NewNode == NULL) || (Index == NULL)) { + AppendImportantMessage(_("Invalid Parameter"), -1); + url_do_template(); + return; } + + NodeConfig = load_netconf(NULL, &NoCtx); + Put(NodeConfig, ChrPtr(Index), StrLength(Index), NewNode, DeleteNodeConf); + save_net_conf(NodeConfig); + DeleteHash(&NodeConfig); } + url_do_template(); +} - -void display_add_node(void) { - - printf("HTTP/1.0 200 OK\n"); - output_headers(1, "bottom"); - wprintf("
"); - wprintf("Add a new node\n"); - wprintf("
\n"); - - wprintf("
"); - wprintf("
\n"); - - wprintf("Enter name of new node: "); - wprintf("
\n"); - - wprintf(""); - wprintf(""); - - wprintf("
\n"); - wDumpContent(1); +/* + * modify an existing node + */ +void display_edit_node(void) { + WCTemplputParams SubTP; + HashList *NodeConfig; + const StrBuf *Index; + void *vNode; + const StrBuf *Tmpl; + + Index = sbstr("index"); + if (Index == NULL) { + AppendImportantMessage(_("Invalid Parameter"), -1); + url_do_template(); + return; } - - -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, "bottom"); - server_to_text(); - wprintf("Back to menu\n"); - wDumpContent(1); - } - else { - display_error(&buf[4]); - } - } - + NodeConfig = load_netconf(NULL, &NoCtx); + if (!GetHash(NodeConfig, ChrPtr(Index), StrLength(Index), &vNode) || + (vNode == NULL)) { + AppendImportantMessage(_("Invalid Parameter"), -1); + url_do_template(); + DeleteHash(&NodeConfig); + return; } + StackContext(NULL, &SubTP, vNode, CTX_NODECONF, 0, NULL); + { + begin_burst(); + Tmpl = sbstr("template"); + output_headers(1, 0, 0, 0, 1, 0); + DoTemplate(SKEY(Tmpl), NULL, &SubTP); + end_burst(); + } + UnStackContext(&SubTP); + DeleteHash(&NodeConfig); + +} +/* + * display all configured nodes + */ +void display_netconf(void) { + wDumpContent(1); +} -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, "bottom"); - wprintf("
"); - wprintf("Add a shared room\n"); - wprintf("
\n"); - - wprintf("
"); - wprintf("
\n"); - 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("\n"); - wprintf("
\n"); - - wprintf(""); - wprintf(""); - - wprintf("
\n"); +/* + * display the dialog to verify the deletion + */ +void display_confirm_delete_node(void) { wDumpContent(1); +} - /* free the list */ - while (shlist != NULL) { - shptr = shlist->next; - free(shlist); - shlist = shptr; - } +/* + * actually delete the node + */ +void delete_node(void) { + HashList *NodeConfig; + const StrBuf *Index; + NodeConf *Node; + void *vNode; + + Index = sbstr("index"); + if (Index == NULL) { + AppendImportantMessage(_("Invalid Parameter"), -1); + url_do_template(); + return; } - - -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, "bottom"); - server_to_text(); - wprintf("Back to menu\n"); - wDumpContent(1); - } - else { - display_error(&buf[4]); - } - - } + NodeConfig = load_netconf(NULL, &NoCtx); + if (!GetHash(NodeConfig, ChrPtr(Index), StrLength(Index), &vNode) || + (vNode == NULL)) { + AppendImportantMessage(_("Invalid Parameter"), -1); + url_do_template(); + DeleteHash(&NodeConfig); + return; } - + Node = (NodeConf *) vNode; + Node->DeleteMe = 1; + save_net_conf(NodeConfig); + DeleteHash(&NodeConfig); + + url_do_template(); + +} + + +void tmplput_NodeName(StrBuf *Target, WCTemplputParams *TP) { + NodeConf *Node = (NodeConf*) CTX(CTX_NODECONF); + StrBufAppendTemplate(Target, TP, Node->NodeName, 0); +} + +void tmplput_Secret(StrBuf *Target, WCTemplputParams *TP) { + NodeConf *Node = (NodeConf*) CTX(CTX_NODECONF); + StrBufAppendTemplate(Target, TP, Node->Secret, 0); +} + +void tmplput_Host(StrBuf *Target, WCTemplputParams *TP) { + NodeConf *Node= (NodeConf*) CTX(CTX_NODECONF); + StrBufAppendTemplate(Target, TP, Node->Host, 0); +} + +void tmplput_Port(StrBuf *Target, WCTemplputParams *TP) { + NodeConf *Node= (NodeConf*) CTX(CTX_NODECONF); + StrBufAppendTemplate(Target, TP, Node->Port, 0); +} + +void +InitModule_NETCONF +(void) +{ + RegisterCTX(CTX_NODECONF); + WebcitAddUrlHandler(HKEY("display_edit_node"), "", 0, display_edit_node, 0); + + WebcitAddUrlHandler(HKEY("aide_ignetconf_edit_node"), "", 0, edit_node, 0); + WebcitAddUrlHandler(HKEY("display_netconf"), "", 0, display_netconf, 0); + WebcitAddUrlHandler(HKEY("display_confirm_delete_node"), "", 0, display_confirm_delete_node, 0); + WebcitAddUrlHandler(HKEY("delete_node"), "", 0, delete_node, 0); + + + RegisterNamespace("CFG:IGNET:NODE", 0, 1, tmplput_NodeName, NULL, CTX_NODECONF); + RegisterNamespace("CFG:IGNET:SECRET", 0, 1, tmplput_Secret, NULL, CTX_NODECONF); + RegisterNamespace("CFG:IGNET:HOST", 0, 1, tmplput_Host, NULL, CTX_NODECONF); + RegisterNamespace("CFG:IGNET:PORT", 0, 1, tmplput_Port, NULL, CTX_NODECONF); + + RegisterIterator("NODECONFIG", 0, NULL, load_netconf, NULL, DeleteHash, CTX_NODECONF, CTX_NONE, IT_NOFLAG); +}