[fix] mapping sub2ip issue

src/broker/modules/subscription.go

@@ -8,10 +8,10 @@ type sub_manager struct {
 	list topicList
 
 	/* Manage sub# */
-	count_sub  int                  // Subscription #
+	count_sub 	 int               // Subscription #
 	emptylist  []int                // To administrate sub #
 	ip2sub     map[string][]int     // ip2sub[ip] = sub# ...
-	sub2ip     map[int]string       // sub2ip[sub#] = ip
+	sub2ip	   map[int]string		// sub2ip[sub#] = ip
 	sub2node   map[int][]*valueNode // sub2node[sub#] = node_addr ...
 	israngesub map[int]bool         // To manage when deleted
 }
@@ -41,14 +41,15 @@ func (manager *sub_manager) addSubscription(msg MsgUnit) error {
 	// * 1. Mapping incoming IP address to sub #
 
 	if len(manager.emptylist) == 0 {
-		manager.ip2sub[msg.(*SubscriptionMsg).From] = append(manager.ip2sub[msg.(*SubscriptionMsg).From], manager.count_sub)
 		subnumber = manager.count_sub
+		manager.ip2sub[msg.(*SubscriptionMsg).from] = append(manager.ip2sub[msg.(*SubscriptionMsg).from], manager.count_sub)
+		manager.sub2ip[subnumber] = msg.(*SubscriptionMsg).from
 		manager.count_sub++
 	} else {
-		subidx := manager.emptylist[len(manager.emptylist)-1]
+		subnumber := manager.emptylist[len(manager.emptylist)-1]
 		manager.emptylist = manager.emptylist[:len(manager.emptylist)-1]
-		manager.ip2sub[msg.(*SubscriptionMsg).From] = append(manager.ip2sub[msg.(*SubscriptionMsg).From], subidx)
-		subnumber = subidx
+		manager.ip2sub[msg.(*SubscriptionMsg).from] = append(manager.ip2sub[msg.(*SubscriptionMsg).from], subnumber)
+		manager.sub2ip[subnumber] = msg.(*SubscriptionMsg).from
 	}
 
 	nameptr := manager.list.head
@@ -70,7 +71,7 @@ func (manager *sub_manager) addSubscription(msg MsgUnit) error {
 		nameptr = manager.list.tail
 	}
 
-	// Add Value to list[name]
+	// Add value to list[name]
 	if len(operator) == 1 { // if single expression
 		valptr := nameptr.list.getValueNodePos(value)
 		if valptr == nil {
@@ -80,15 +81,14 @@ func (manager *sub_manager) addSubscription(msg MsgUnit) error {
 
 		manager.sub2node[subnumber] = append(manager.sub2node[subnumber], valptr)
 		valptr.insertSub(operator[0], subnumber, true)
-
 		return nil // AddSubscription ok
 	} else {
-
+      
 		// For compound expressions bounded by '&&' and '||'
 		// (ex) { (234 < x) && (x <= 1293) } , { (234 < x) || ( x < 1293) }
 		logical_operator := operator[1]
 
-		// Find ValueNode = (namelist[name].list.val == Value)
+		// Find ValueNode = (namelist[name].list.val == value)
 		valptr1 := nameptr.list.getValueNodePos([]int64{value[0]})
 		valptr2 := nameptr.list.getValueNodePos([]int64{value[1]})
 
@@ -105,13 +105,13 @@ func (manager *sub_manager) addSubscription(msg MsgUnit) error {
 		manager.sub2node[subnumber] = append(manager.sub2node[subnumber], valptr2)
 
 		if logical_operator == "&&" {
-			// If they are enclosed in '&&' -> Insert Value to range_operator_list
+			// If they are enclosed in '&&' -> Insert value to range_operator_list
 			manager.israngesub[subnumber] = true
 			valptr1.insertSub(operator[0], subnumber, false)
 			valptr2.insertSub(operator[2], subnumber, false)
 
 		} else {
-			// if they are enclosed in '||' -> Insert Value to single_operator_list
+			// if they are enclosed in '||' -> Insert value to single_operator_list
 			valptr1.insertSub(operator[0], subnumber, true)
 			valptr2.insertSub(operator[2], subnumber, true)
 		}
@@ -214,6 +214,6 @@ func (manager *sub_manager) delete(from string) error {
 			}
 		}
 	}
-	manager.ip2sub[ip] = nil // Delete sub#s mapped to Ip address
+	manager.ip2sub[ip]=nil // Delete sub#s mapped to Ip address
 	return nil
-}
+}