[bwm-tools-devel] COMMIT - r24 - trunk/include

[SVN C. <sv...@li...>]

Author: nkukard
Date: 2005-01-03 15:40:41 +0200 (Mon, 03 Jan 2005)
New Revision: 24

Modified:
   trunk/include/flow.h
   trunk/include/xmlConf.h
Log:
* Change 4/4: Depletion of lib


Modified: trunk/include/flow.h
===================================================================
--- trunk/include/flow.h	2005-01-03 13:40:24 UTC (rev 23)
+++ trunk/include/flow.h	2005-01-03 13:40:41 UTC (rev 24)
@@ -161,28 +161,6 @@
 struct pktStat_t getFlowTotalStats(struct pktStat_t *pktStats, long int pktStatsLen);
 
 
-// Create a flow
-struct flow_t* createFlow(
-		char *flowName,
-		struct flow_t *parentFlow,
-		long int statsLen, 
-		long int maxQueueSize, 
-		long int maxQueueLen, 
-		long int maxRate,
-		long int burstRate,
-		long int nfmark,
-		float parent_th,
-		int reportTimeout);
-
-
-// Create group
-struct group_t *createGroup(
-		char *groupName, 
-		long int statsLen, 
-		int reportTimeout, 
-		GList *flowList);
-
-
 // Function to update all our flow groups
 void updateGroups(
 		struct flow_t *flow, 
@@ -192,13 +170,6 @@
 		int pktBursted);
 
 
-// Create a packet queue
-struct pktQueue_t *createPktQueue(
-		long int prio,
-		long int nfmark,
-		struct flow_t *parentFlow);
-
-	
 // Flow runner thread
 void *flowRunner(void *data);
 

Modified: trunk/include/xmlConf.h
===================================================================
--- trunk/include/xmlConf.h	2005-01-03 13:40:24 UTC (rev 23)
+++ trunk/include/xmlConf.h	2005-01-03 13:40:41 UTC (rev 24)
@@ -26,6 +26,7 @@
 #define _XMLCONF_H
 
 #include <glib.h>
+#include <libxml/parser.h>
 
 
 // An address declaration with all its lil params
@@ -70,8 +71,30 @@
 };
 
 
+
+// Function to get a chain if it exists or to create it
+struct confACLChain_t *lookupChain(GHashTable *chains, char *chainName);
+
+// Function to get a table if it exists or to create it
+struct confACLTable_t *lookupTable(GHashTable *tables, char *tableName);
+
+// Parse the GLOBAL section to get modules we must load
 GHashTable *getModuleLoadHash(char *filename);
-GList *createFirewallRules(char *filename);
+
+// Parse the TRAFFIC section and create flows + queues
 struct flowData_t createFlowData(char *filename);
 
+// Parse the NAT section
+void parseNAT(xmlDocPtr doc, xmlNodePtr cur, GHashTable *fwHash, GHashTable *classHash);
+
+// Parse the TRAFFIC section
+void parseTraffic(xmlDocPtr doc, xmlNodePtr cur, GHashTable *fwHash, GHashTable *classHash);
+
+// Parse the GLOBAL section
+GHashTable *parseGlobal(xmlDocPtr doc, xmlNodePtr cur);
+
+// Parse the ACL section
+GHashTable *parseACL(xmlDocPtr doc, xmlNodePtr cur, GHashTable *fwHash, GHashTable *classHash);
+
+
 #endif