Changeset 544

Timestamp:

04/26/08 19:29:27 (3 weeks ago)

Author:

agr

Message:

SAMPL neighbor list packets

Files:

• nano-RK/projects/SAMPL/app_pkt_handlers/neighbor_pkt.c (added)
• nano-RK/projects/SAMPL/app_pkt_handlers/neighbor_pkt.h (added)
• nano-RK/projects/SAMPL/app_pkt_handlers/stats_pkt.c (modified) (1 diff)
• nano-RK/projects/SAMPL/client/globals.h (modified) (1 diff)
• nano-RK/projects/SAMPL/client/main.c (modified) (3 diffs)
• nano-RK/projects/SAMPL/client/makefile (modified) (1 diff)
• nano-RK/projects/SAMPL/client/nrk_cfg.h (modified) (1 diff)
• nano-RK/src/net/route_table/route_table.c (modified) (9 diffs)
• nano-RK/src/net/route_table/route_table.h (modified) (3 diffs)

nano-RK/projects/SAMPL/app_pkt_handlers/stats_pkt.c

@@ -89 +89 @@
-uint8_t stats_pkt_add( STATS_PKT_T *p, uint8_t *buf, uint8_t index )
-{
-+STATS_PKT_SIZE>MAX_PKT_PAYLOAD ) return (index*STATS_PKT_SIZE+
+>MAX_PKT_PAYLOAD ) return (index*
-   buf[index*STATS_PKT_SIZE]= p->mac_addr;
-   buf[index*STATS_PKT_SIZE+1]= (p->rx_pkts>>8)&0xff;

nano-RK/projects/SAMPL/client/globals.h

@@ -10 +10 @@
-uint8_t admin_debug_flag;
-int8_t mobile_reserve;
+uint16_t neighborlist_ttl;
-
-

nano-RK/projects/SAMPL/client/main.c

@@ -183 +183 @@
-  route_table_init();
-
-
+
+
+
+
-  last_flood_check_rate = 100;
-  // Setup some default values
@@ -360 +363 @@
-      // Set the reply address for the gateway (mac=0) to last-hop with no ttl timeout
-        route_table_set( GATEWAY_MAC, ds_pkt.last_hop_mac, 0 );
+        // Add neighbor, with timeout
+        route_table_set( ds_pkt.last_hop_mac, ds_pkt.last_hop_mac, neighborlist_ttl );
+        // Insert RSSI from neighbor 
+        route_table_value_set(ds_pkt.last_hop_mac, 0, ds_pkt.rssi );
+
-         if(ds_pkt.ctrl_flags & ENCRYPT != 0)
-         {
@@ -385 +393 @@
-   // Upstream Packet to Aggregate
-    else if (ff_state == FLOOD_ACTIVE_STATE && upstream == 1) {
+        // Add neighbor, with timeout
+        route_table_set( us_pkt.last_hop_src_mac, us_pkt.last_hop_src_mac, neighborlist_ttl );
+        // Insert RSSI from neighbor 
+        route_table_value_set(us_pkt.last_hop_src_mac, 0, us_pkt.rssi );
+
-      if ( us_pkt_in.seq_num == last_flood_seq_num && check_subnet( us_pkt_in.subnet_mac, my_subnet_mac)==1 ) {
-        if ((last_flood_ctrl & TREE_FILTER) != 0) {

nano-RK/projects/SAMPL/client/makefile

@@ -32 +32 @@
-SRC += ../app_pkt_handlers/stats_pkt.c
-SRC += ../app_pkt_handlers/trace.c
+SRC += ../app_pkt_handlers/neighbor_pkt.c
-SRC += ../app_pkt_handlers/eeprom_data.c
-SRC += ../app_pkt_handlers/control_pkt.c

nano-RK/projects/SAMPL/client/nrk_cfg.h

@@ -46 +46 @@
-#define NRK_MAX_RESOURCE_CNT           2
-
+#define ROUTE_TABLE_SIZE        15
+#define ROUTE_TABLE_VALUES      1
+
+
-// 1 reserve for bmac
-// 1 reserve for mobile nodes

nano-RK/src/net/route_table/route_table.c

@@ -13 +13 @@
-for(i=0; i<ROUTE_TABLE_SIZE; i++ )
-        {
-valid
+flags
-        route_table[i].dst=0;   
-        route_table[i].next_hop=0;      
@@ -41 +41 @@
-                    else
-                        {
-valid
+flags
-                        route_table[i].ttl=0;
-                        route_table[i].dst=0;
@@ -63 +63 @@
-                        route_table[i].next_hop=next_hop;
-                        route_table[i].ttl=ttl;
-valid=1
+flags|=VALID_MASK
-                        return NRK_OK;
-                }
@@ -73 +73 @@
-           route_table[found].next_hop=next_hop;
-           route_table[found].ttl=ttl;
-valid=1
+flags|=VALID_MASK
-           return NRK_OK;
-        }
@@ -86 +86 @@
-        if(route_table[i].dst==dst)
-                {
-valid
+flags
-                  route_table[i].dst=0;
-                  route_table[i].ttl=0;
@@ -103 +103 @@
-for(i=0; i<ROUTE_TABLE_SIZE; i++ )
-        {
-route_table[i].valid==1
+(route_table[i].flags & VALID_MASK)!=0
-                  return (route_table[i].next_hop);
-        }
@@ -116 +116 @@
-for(i=0; i<ROUTE_TABLE_SIZE; i++ )
-        {
-route_table[i].valid==1
+(route_table[i].flags & VALID_MASK )!=0
-                {
-                   route_table[i].value[value_index]=value;     
@@ -131 +131 @@
-for(i=0; i<ROUTE_TABLE_SIZE; i++ )
-        {
-route_table[i].valid==1
+(route_table[i].flags & VALID_MASK) !=0
-                {
-                   return (route_table[i].value[value_index]);
@@ -139 +139 @@
-}
-
+// This function returns the next valid index including
+// the entered value.
+//
+// For example if index 0 and 4 are valid
+// route_table_get_next_valid_index(0) returns 0
+// route_table_get_next_valid_index(1) returns 4
+// route_table_get_next_valid_index(4) returns 4
+// route_table_get_next_valid_index(5) returns -1 
+int8_t route_table_get_next_valid_index(uint8_t start_index)
+{
+uint8_t i;
+if(start_index>=ROUTE_TABLE_VALUES ) return NRK_ERROR;
+for(i=start_index; i<ROUTE_TABLE_SIZE; i++ )
+        if((route_table[i].flags & VALID_MASK) !=0 )
+                   return i; 
+return NRK_ERROR;
+}
-
+uint16_t route_table_get_dst_by_index(int8_t index)
+{
+if(index>=ROUTE_TABLE_VALUES ) return 0;
+return route_table[index].dst;
-
+}

nano-RK/src/net/route_table/route_table.h

@@ -14 +14 @@
-#endif
-
+#define VALID_MASK              0x01
+#define EXTENDED_ADDRESS_MASK   0x02
+
+
-typedef struct route_type {
-uint16_t dst;
-uint16_t next_hop;
-uint16_t ttl; 
-valid
+flags
-int8_t value[ROUTE_TABLE_VALUES]; 
-} route_table_t;
@@ -25 +29 @@
-
-int8_t route_table_init();
- 
+
-int8_t route_table_clr( uint16_t dst);
-uint16_t route_table_get( uint16_t dst);
@@ -33 +37 @@
-int8_t route_table_value_get(uint16_t dst, uint8_t value_index);
-
+// Use these functions to help do neighbor list tabulation
+int8_t route_table_get_next_valid_index(uint8_t start_index);
+uint16_t route_table_get_dst_by_index(int8_t index);
+
-#endif