From cf734a480c44da62980e83eea72c33e1d4d8df1c Mon Sep 17 00:00:00 2001
From: c9s <yoanlin93@gmail.com>
Date: Tue, 27 May 2014 14:16:42 +0800
Subject: [PATCH] edge branch with routes and other resets

---
 include/r3.h |  1 +
 src/edge.c   | 21 +++++++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/include/r3.h b/include/r3.h
index 9e9721a..d80b2d0 100644
--- a/include/r3.h
+++ b/include/r3.h
@@ -54,6 +54,7 @@ typedef struct _route route;
 
 struct _node {
     edge  ** edges;
+    // edge  ** edge_table;
 
     // almost less than 255
     unsigned char    edge_len;
diff --git a/src/edge.c b/src/edge.c
index 30e828e..b5b8bd0 100644
--- a/src/edge.c
+++ b/src/edge.c
@@ -49,27 +49,36 @@ node * r3_edge_branch(edge *e, int dl) {
     char * s1 = e->pattern + dl;
     int s1_len = 0;
 
-    edge **tmp_edges = e->child->edges;
-    int   tmp_edge_len = e->child->edge_len;
-
     // the suffix edge of the leaf
     new_child = r3_tree_create(3);
     s1_len = e->pattern_len - dl;
     e1 = r3_edge_create(zstrndup(s1, s1_len), s1_len, new_child);
 
     // Migrate the child edges to the new edge we just created.
-    for ( int i = 0 ; i < tmp_edge_len ; i++ ) {
-        r3_node_append_edge(new_child, tmp_edges[i]);
+    for ( int i = 0 ; i < e->child->edge_len ; i++ ) {
+        r3_node_append_edge(new_child, e->child->edges[i]);
         e->child->edges[i] = NULL;
     }
     e->child->edge_len = 0;
+
+
+    // Migrate the child routes
+    for ( int i = 0 ; i < e->child->route_len ; i++ ) {
+        r3_node_append_route(new_child, e->child->routes[i]);
+        e->child->routes[i] = NULL;
+    }
+    e->child->route_len = 0;
+
+    // Migrate the endpoint
     new_child->endpoint = e->child->endpoint;
     e->child->endpoint = 0; // reset endpoint
 
-    r3_node_append_edge(e->child, e1);
+    // Migrate the data
     new_child->data = e->child->data; // copy data pointer
     e->child->data = NULL;
 
+    r3_node_append_edge(e->child, e1);
+
     // truncate the original edge pattern
     char *oldpattern = e->pattern;
     e->pattern = zstrndup(e->pattern, dl);