-/*
- * $Id$
- */
-/**
- * \defgroup NetShareConf Functions which handle network and sharing configuration.
- *
- * \ingroup CitadelConfig
- */
-/*@{*/
#include "webcit.h"
void display_netconf(void);
+CtxType CTX_NODECONF = CTX_NONE;
+
/*----------------------------------------------------------------------*/
+
/* Business Logic */
+
/*----------------------------------------------------------------------*/
typedef struct _nodeconf {
StrBuf *Secret;
StrBuf *Host;
StrBuf *Port;
-}NodeConf;
+} NodeConf;
-void DeleteNodeConf(void *vNode)
-{
- NodeConf *Node = (NodeConf*) vNode;
+void DeleteNodeConf(void *vNode) {
+ NodeConf *Node = (NodeConf *) vNode;
FreeStrBuf(&Node->NodeName);
FreeStrBuf(&Node->Secret);
FreeStrBuf(&Node->Host);
free(Node);
}
-NodeConf *NewNode(StrBuf *SerializedNode)
-{
+NodeConf *NewNode(StrBuf * SerializedNode) {
NodeConf *Node;
- if (StrLength(SerializedNode) < 8)
+ 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();
+ Node->NodeName = NewStrBuf();
StrBufExtract_token(Node->NodeName, SerializedNode, 0, '|');
- Node->Secret=NewStrBuf();
+ Node->Secret = NewStrBuf();
StrBufExtract_token(Node->Secret, SerializedNode, 1, '|');
- Node->Host=NewStrBuf();
+ Node->Host = NewStrBuf();
StrBufExtract_token(Node->Host, SerializedNode, 2, '|');
- Node->Port=NewStrBuf();
+ Node->Port = NewStrBuf();
StrBufExtract_token(Node->Port, SerializedNode, 3, '|');
return Node;
}
-NodeConf *HttpGetNewNode(void)
-{
+NodeConf *HttpGetNewNode(void) {
NodeConf *Node;
- if (!havebstr("node") ||
- !havebstr("secret")||
- !havebstr("host")||
- !havebstr("port"))
+ if (!havebstr("node") || !havebstr("secret") || !havebstr("host") || !havebstr("port"))
return NULL;
Node = (NodeConf *) malloc(sizeof(NodeConf));
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));
+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, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
-{
+HashList *load_netconf(StrBuf * Target, WCTemplputParams * TP) {
StrBuf *Buf;
HashList *Hash;
char nnn[64];
char buf[SIZ];
- long len;
int nUsed;
NodeConf *Node;
Hash = NewHash(1, NULL);
Buf = NewStrBuf();
- while ((len = StrBuf_ServGetln(Buf),
- strcmp(ChrPtr(Buf), "000"))) {
+ while (StrBuf_ServGetln(Buf), strcmp(ChrPtr(Buf), "000")) {
Node = NewNode(Buf);
- if (Node == NULL)
- continue;
- nUsed = GetCount(Hash);
- nUsed = snprintf(nnn, sizeof(nnn), "%d", nUsed+1);
- Put(Hash, nnn, nUsed, Node, DeleteNodeConf);
+ if (Node != NULL) {
+ nUsed = GetCount(Hash);
+ nUsed = snprintf(nnn, sizeof(nnn), "%d", nUsed + 1);
+ Put(Hash, nnn, nUsed, Node, DeleteNodeConf);
+ }
}
FreeStrBuf(&Buf);
return Hash;
}
-void NodeCfgSubst(StrBuf *TemplBuffer, void *vContext, WCTemplateToken *Token)
-{
- NodeConf *Node= (NodeConf*)vContext;
-
- SVPutBuf("CFG:IGNET:NODE", Node->NodeName, 1);
- SVPutBuf("CFG:IGNET:SECRET", Node->Secret, 1);
- SVPutBuf("CFG:IGNET:HOST", Node->Host, 1);
- SVPutBuf("CFG:IGNET:PORT", Node->Port, 1);
-}
-
-void save_net_conf(HashList *Nodelist)
-{
+void save_net_conf(HashList * Nodelist) {
char buf[SIZ];
StrBuf *Buf;
HashPos *where;
where = GetNewHashPos(Nodelist, 0);
Buf = NewStrBuf();
while (GetNextHashPos(Nodelist, where, &KeyLen, &Key, &vNode)) {
- Node = (NodeConf*) vNode;
- if (Node->DeleteMe==0) {
+ Node = (NodeConf *) vNode;
+ if (Node->DeleteMe == 0) {
SerializeNode(Node, Buf);
serv_putbuf(Buf);
}
}
FreeStrBuf(&Buf);
+ DeleteHashPos(&where);
}
serv_puts("000");
}
/*----------------------------------------------------------------------*/
+
/* WEB Handlers */
+
/*----------------------------------------------------------------------*/
-/**
- * \brief edit a network node
+/*
+ * edit a network node
*/
void edit_node(void) {
HashList *NodeConfig;
if (havebstr("ok_button")) {
Index = sbstr("index");
- NewNode = HttpGetNewNode();
+ NewNode = HttpGetNewNode();
if ((NewNode == NULL) || (Index == NULL)) {
- sprintf(WC->ImportantMessage, _("Invalid Parameter"));
+ AppendImportantMessage(_("Invalid Parameter"), -1);
url_do_template();
return;
}
-
- NodeConfig = load_netconf(NULL, 0, NULL, NULL, CTX_NONE);
+
+ NodeConfig = load_netconf(NULL, &NoCtx);
Put(NodeConfig, ChrPtr(Index), StrLength(Index), NewNode, DeleteNodeConf);
save_net_conf(NodeConfig);
DeleteHash(&NodeConfig);
}
-/**
- * \brief modify an existing node
+/*
+ * modify an existing node
*/
-void display_edit_node(void)
-{
+void display_edit_node(void) {
+ WCTemplputParams SubTP;
HashList *NodeConfig;
const StrBuf *Index;
void *vNode;
+ const StrBuf *Tmpl;
Index = sbstr("index");
if (Index == NULL) {
- sprintf(WC->ImportantMessage, _("Invalid Parameter"));
+ AppendImportantMessage(_("Invalid Parameter"), -1);
url_do_template();
return;
}
- NodeConfig = load_netconf(NULL, 0, NULL, NULL, CTX_NONE);
- if (!GetHash(NodeConfig, ChrPtr(Index), StrLength(Index), &vNode) ||
- (vNode == NULL)) {
- sprintf(WC->ImportantMessage, _("Invalid Parameter"));
+ 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;
}
-
- NodeCfgSubst(NULL, vNode, NULL);
- SVPutBuf("ITERATE:KEY", Index, 1);
- url_do_template();
-
+ 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);
-
+
}
-/**
- * \brief display all configured nodes
+/*
+ * display all configured nodes
*/
-void display_netconf(void)
-{
+void display_netconf(void) {
wDumpContent(1);
}
-/**
- * \brief display the dialog to verify the deletion
+/*
+ * display the dialog to verify the deletion
*/
-void display_confirm_delete_node(void)
-{
+void display_confirm_delete_node(void) {
wDumpContent(1);
}
-/**
- * \brief actually delete the node
+/*
+ * actually delete the node
*/
-void delete_node(void)
-{
+void delete_node(void) {
HashList *NodeConfig;
const StrBuf *Index;
NodeConf *Node;
Index = sbstr("index");
if (Index == NULL) {
- sprintf(WC->ImportantMessage, _("Invalid Parameter"));
+ AppendImportantMessage(_("Invalid Parameter"), -1);
url_do_template();
return;
}
- NodeConfig = load_netconf(NULL, 0, NULL, NULL, CTX_NONE);
- if (!GetHash(NodeConfig, ChrPtr(Index), StrLength(Index), &vNode) ||
- (vNode == NULL)) {
- sprintf(WC->ImportantMessage, _("Invalid Parameter"));
+ 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);
+ save_net_conf(NodeConfig);
DeleteHash(&NodeConfig);
-
+
url_do_template();
}
-void
-InitModule_NETCONF
-(void)
-{
- WebcitAddUrlHandler(HKEY("display_edit_node"), display_edit_node, 0);
-
- WebcitAddUrlHandler(HKEY("edit_node"), edit_node, 0);
- WebcitAddUrlHandler(HKEY("display_netconf"), display_netconf, 0);
- WebcitAddUrlHandler(HKEY("display_confirm_delete_node"), display_confirm_delete_node, 0);
- WebcitAddUrlHandler(HKEY("delete_node"), delete_node, 0);
- RegisterIterator("NODECONFIG", 0, NULL, load_netconf, NodeCfgSubst, DeleteHash, CTX_NODECONF, CTX_NONE);
+
+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);
}
-/*@}*/