From c45ed9f5d518e3777a635f4c1834b1446b3efa8b Mon Sep 17 00:00:00 2001
From: Sears Russell <sears@cs.berkeley.edu>
Date: Sun, 2 Jan 2005 01:37:05 +0000
Subject: [PATCH] Network configuration parser is working

---
 libdfa/networksetup.sample    |  6 ++++++
 src/libdfa/networksetup.c     | 33 ++++++++++++++++++++++++++++++++-
 test/dfa/check_networksetup.c |  2 +-
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/libdfa/networksetup.sample b/libdfa/networksetup.sample
index bc72321..a0ee7f6 100644
--- a/libdfa/networksetup.sample
+++ b/libdfa/networksetup.sample
@@ -5,3 +5,9 @@ subordinates =  {
 		  127.0.0.1:20003,
 		  127.0.0.1:20004 
 		}
+group 1 {
+  members = {1, 3}
+}
+group 2 {
+  members = {2, 4}
+}
diff --git a/src/libdfa/networksetup.c b/src/libdfa/networksetup.c
index bd742a6..d2cb45b 100644
--- a/src/libdfa/networksetup.c
+++ b/src/libdfa/networksetup.c
@@ -40,10 +40,16 @@ int validate_host_port(cfg_t *cfg, cfg_opt_t *opt) {
   return 0;
 }
 
+cfg_opt_t group_opts[] = {
+  CFG_INT_LIST("members", "{1,2,3}", CFGF_NONE),
+  CFG_END()
+};
+
 cfg_opt_t opts[] = {
   CFG_STR("coordinator", "127.0.0.1:10000", CFGF_NONE),
   CFG_STR_LIST("subordinates", 
     "{127.0.0.1:10001,127.0.0.1:10002,127.0.0.1:10003}", CFGF_NONE),
+  CFG_SEC("group", group_opts, CFGF_TITLE | CFGF_MULTI),
   CFG_END()
 };
 NetworkSetup * readNetworkConfig(char * name, int hostnumber) {
@@ -70,7 +76,32 @@ NetworkSetup * readNetworkConfig(char * name, int hostnumber) {
   } else {
     printf("I am subordinate # %d\n", hostnumber);
   }
+  NetworkSetup * ret = calloc(1, sizeof(NetworkSetup));
+  
+  ret->localport = hostnumber == COORDINATOR 
+		      ? parse_port(cfg_getstr(cfg, "coordinator"))
+		      : parse_port(cfg_getnstr(cfg, "subordinates", hostnumber));
+  ret->localhost = hostnumber == COORDINATOR
+		      ? parse_addr(cfg_getstr(cfg, "coordinator"))
+		      : parse_addr(cfg_getnstr(cfg, "subordinates", hostnumber));
+  ret->socket    = -1; /// @todo where should the socket field be initialized?
+  ret->broadcast_lists_count = cfg_size(cfg, "group");
+  printf("broadcast list count = %d\n", ret->broadcast_lists_count);
+  ret->broadcast_list_host_count = malloc(sizeof(int *) * ret->broadcast_lists_count);
+  ret->broadcast_lists = malloc(sizeof(int**) * ret->broadcast_lists_count);
+  for(i = 0; i < ret->broadcast_lists_count; i++) {
+    cfg_t * group_cfg = cfg_getnsec(cfg, "group", i);
+    
+    int j;
+    ret->broadcast_list_host_count[i] = cfg_size(group_cfg, "members");
+    ret->broadcast_lists[i] = malloc(sizeof (int *) * ret->broadcast_list_host_count[i]);
+    printf("Group %d size %d\n", atoi(cfg_title(group_cfg)), ret->broadcast_list_host_count[i]);
+    for(j = 0; j < ret->broadcast_list_host_count[i]; j++) {
+       (*ret->broadcast_lists)[i][j] = cfg_getnint(group_cfg, "members", j);
+       printf("\t->%d\n", (*ret->broadcast_lists)[i][j]);
+    }
+  }
   
   cfg_free(cfg);
-  return NULL;
+  return ret;
 }
diff --git a/test/dfa/check_networksetup.c b/test/dfa/check_networksetup.c
index b9376e7..d119211 100644
--- a/test/dfa/check_networksetup.c
+++ b/test/dfa/check_networksetup.c
@@ -54,7 +54,7 @@ terms specified in this license.
     @test
 */
 START_TEST (networksetup_check) {
-  readNetworkConfig("../../libdfa/networksetup.sample", COORDINATOR);
+  assert(readNetworkConfig("../../libdfa/networksetup.sample", COORDINATOR));
 }
 END_TEST
 /**