commenting the freeing part after creating a slice
line to resolve a bug. CHANGES ARE TEMPORARY
diff --git a/nlsr-sync-0.0/Makefile b/nlsr-sync-0.0/Makefile
index ae2b195..abe7b08 100755
--- a/nlsr-sync-0.0/Makefile
+++ b/nlsr-sync-0.0/Makefile
@@ -1,5 +1,5 @@
CC = gcc
-CFLAGS = -g -Wall
+CFLAGS = -g -Wall -gdwarf-2 -g3
LIBS = -lccn -lccnsync -lcrypto
PROGRAMS = nlsrc nlsr
diff --git a/nlsr-sync-0.0/nlsr_lsdb.c b/nlsr-sync-0.0/nlsr_lsdb.c
index f880cc0..8692eca 100755
--- a/nlsr-sync-0.0/nlsr_lsdb.c
+++ b/nlsr-sync-0.0/nlsr_lsdb.c
@@ -30,7 +30,7 @@
void
set_new_lsdb_version(void)
{
-
+//Obaid: this method needs to be modified, no need to free and allocate memory again
char *time_stamp=(char *)malloc(20);
memset(time_stamp,0,20);
get_current_timestamp_micro(time_stamp);
@@ -2067,8 +2067,8 @@
void
write_adj_lsa_to_repo(char *repo_content_prefix, struct name_prefix *lsa_id)
{
- printf("Content Preifx: %s\n",repo_content_prefix);
-
+
+ printf("Content Prefix: %s\n",repo_content_prefix);
struct ccn_charbuf *lsa_data=ccn_charbuf_create();
get_adj_lsa_data(lsa_data,lsa_id);
@@ -2082,8 +2082,7 @@
void
write_name_lsa_to_repo(char *repo_content_prefix, struct name_prefix *lsa_id)
{
- printf("Content Preifx: %s\n",repo_content_prefix);
-
+ printf("****Content Prefix: %s\n",repo_content_prefix);
struct ccn_charbuf *lsa_data=ccn_charbuf_create();
get_name_lsa_data(lsa_data,lsa_id);
diff --git a/nlsr-sync-0.0/nlsr_sync.c b/nlsr-sync-0.0/nlsr_sync.c
index 7b4279b..7a05ec3 100644
--- a/nlsr-sync-0.0/nlsr_sync.c
+++ b/nlsr-sync-0.0/nlsr_sync.c
@@ -465,7 +465,6 @@
ccns_slice_set_topo_prefix(nlsr->slice, topo, prefix);
nlsr->closure->callback = &sync_callback;
nlsr->ccns = ccns_open(nlsr->ccn, nlsr->slice, nlsr->closure, roothash, NULL);
-
}
struct ccn_charbuf *
@@ -584,14 +583,17 @@
res = ccns_write_slice(nlsr->ccn, slice, slice_name);
-
+ /*
+// Obaid: commenting out the following lines to resolve a bug.
+// If commenting them can resolve the issue, then we
+// need to call them before terminating the program.
ccns_slice_destroy(&slice);
ccn_charbuf_destroy(&prefix);
ccn_charbuf_destroy(&topo);
ccn_charbuf_destroy(&clause);
ccn_charbuf_destroy(&slice_name);
ccn_charbuf_destroy(&slice_uri);
-
+*/
return 0;
}
diff --git a/nlsr-sync-0.0/pollux.conf b/nlsr-sync-0.0/pollux.conf
index a2c2193..8246983 100755
--- a/nlsr-sync-0.0/pollux.conf
+++ b/nlsr-sync-0.0/pollux.conf
@@ -12,7 +12,7 @@
multi-path-face-num 2
debug on
-topo-prefix /ndn/test/topo/
-slice-prefix /ndn/test/slice/
+topo-prefix /ndn/memphis.edu/nlsr/
+slice-prefix /ndn/memphis.edu/nlsr/lsas/
logdir mylog/