Changeset 559

Timestamp:

04/29/08 19:12:09 (2 weeks ago)

Author:

agr

Message:

SAMPL update

Files:

• nano-RK/projects/SAMPL/client/main.c (modified) (1 diff)
• nano-RK/projects/SAMPL/slip-clients/xmpp-client/ff_config.txt (modified) (1 diff)
• nano-RK/projects/SAMPL/slip-clients/xmpp-client/main.c (modified) (8 diffs)
• nano-RK/projects/SAMPL/slip-clients/xmpp-client/xmpp_pkt_writer.c (modified) (8 diffs)

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

@@ -357 +357 @@
-    }
-    // This is a NEW downstream flood packet
-p2p_pkt_in
+ds_pkt
-        // Got downstream message from someone in subnet, so add to neighbor list 
-        neighbor_list_add( ds_pkt.last_hop_mac, ds_pkt.rssi, neighborlist_ttl );

nano-RK/projects/SAMPL/slip-clients/xmpp-client/ff_config.txt

@@ -28 +28 @@
-# Sensor Short with LED
-# 0x01 0x01 0xb9 0x07 0x00 0xf0 0x00 0x00 0x00 0x00 0x00 0x06 0x01 0x78 0x64 0xd3 0x00 0x00 0x00 0x00 0x00
-
+
+
-

nano-RK/projects/SAMPL/slip-clients/xmpp-client/main.c

@@ -15 +15 @@
-#include "xmpp_pkt_writer.h"
-
+#define SEQ_CACHE_SIZE  24
-
-#define IGNORE_PACKET   0
@@ -20 +21 @@
-#define P2P_PACKET      2
-
+#define gw_subnet_2     0
+#define gw_subnet_1     0
+#define gw_subnet_0     0
-#define gw_mac          0
-
-
-
@@ -40 +43 @@
-  int size;
-  char buffer[2048];
+
+
+void seq_num_cache_init();
+int seq_num_cache_check( uint8_t *mac_addr, uint8_t seq_num, uint8_t pkt_type);
+
+typedef struct seq_num_cache {
+  uint8_t addr[4];
+  uint8_t seq_num;
+  uint8_t pkt_type;
+  int valid;
+} seq_num_cache_t;
+
+seq_num_cache_t seq_cache[SEQ_CACHE_SIZE];
-
-SAMPL_DOWNSTREAM_PKT_T ds_pkt;
@@ -181 +197 @@
-  // clear list of nodes
-  node_list_init();
+  seq_num_cache_init();
-
-  sscanf(username,"%[^@]",name);
@@ -305 +322 @@
-int i,ret;
-int pkt_type;
+uint8_t mac[4];
-char node_name[MAX_NODE_LEN];
-SAMPL_GATEWAY_PKT_T gw_pkt;
@@ -324 +342 @@
-else pkt_type=IGNORE_PACKET;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  // Create an event node if it doesn't already exist and if it is an infrastructure node
-
@@ -358 +391 @@
-        send_xmpp_ping_pkt( &gw_pkt );
-        if(debug_txt_flag==1) printf( "PING or ACK packet\n" );
-
-
+
-
-        case XMPP_PKT:
-        xmpp_pkt_handler( &gw_pkt );
-        if(debug_txt_flag==1) printf( "XMPP packet\n" );
-
-
+
+
+
+
+
+
+
+
+
-        case FF_SENSOR_SHORT_PKT:
-        send_xmpp_sensor_short_pkt( &gw_pkt );
-        if(debug_txt_flag==1) printf( "SENSOR_SHORT packet\n" );
-
-
+
-
-        case TRACEROUTE_PKT:
-        if(debug_txt_flag==1) printf( "TRACEROUTE packet\n" );
-
-
+
+
+
-        default:
-        if(debug_txt_flag==1) printf( "Unknown Packet\n" );
-}
-
+
+
-}
-
@@ -425 +465 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

nano-RK/projects/SAMPL/slip-clients/xmpp-client/xmpp_pkt_writer.c

@@ -10 +10 @@
-#include <ack_pkt.h>
-#include <ff_basic_sensor_pkt.h>
+
+char buf[1024];
-
-void xmpp_pkt_handler(SAMPL_GATEWAY_PKT_T *gw_pkt)
@@ -28 +30 @@
-}
-
+void extended_nlist_pkt_handler(SAMPL_GATEWAY_PKT_T *gw_pkt)
+{
+char node_name[MAX_NODE_LEN];
+uint8_t num_msgs,i;
+char timeStr[64];
+time_t timestamp;
+int8_t rssi;
+
+        sprintf(node_name,"%02x%02x%02x%02x",gw_pkt->subnet_mac[2],
+                gw_pkt->subnet_mac[1],
+                gw_pkt->subnet_mac[0],
+                gw_pkt->src_mac);
+
+        // Check nodes and add them if need be
+        if(xmpp_flag==1) check_and_create_node(node_name);
+        // publish XML data for node
+        time(&timestamp);
+        strftime(timeStr,100,"%Y-%m-%d %X",localtime(&timestamp));
+
+        sprintf(buf,"<Node id=\"%s\" type=\"FIREFLY\" timestamp=\"%s\">", node_name,timeStr );
+
+        num_msgs=gw_pkt->payload[0];
+        printf( "Extended Neighbor List %d:\n", num_msgs ); 
+        for(i=0; i<num_msgs; i++ )
+        {
+        sprintf( node_name,"%02x%02x%02x%02x",gw_pkt->payload[1+i*5],
+                gw_pkt->payload[1+i*5+1],
+                gw_pkt->payload[1+i*5+2],
+                gw_pkt->payload[1+i*5+3] );
+        rssi=(int8_t)gw_pkt->payload[1+i*5+4];
+        sprintf( &buf[strlen(buf)],"<Link linkNode=\"%s\" rssi=\"%d\"/>",node_name,rssi );
+        }
+        sprintf( &buf[strlen(buf)],"</Node>" );
+        
+        if(debug_txt_flag==1 ) printf( "Publish: %s\n",buf);
+//      if(xmpp_flag==1 ) ret = publish_to_node(node_name,buf);
+//      if(xmpp_flag && ret!=XMPP_NO_ERROR) printf( "XMPP Error: %s\n",ERROR_MESSAGE(ret));
+
+
+        if(debug_txt_flag==1) printf( "Publish done\n");
+}
+
+
+
-
-void send_xmpp_ping_pkt(SAMPL_GATEWAY_PKT_T *gw_pkt )
@@ -33 +79 @@
-PING_PKT_T p;
-char node_name[MAX_NODE_LEN];
-char buf[1024];
-char timeStr[64];
-time_t timestamp;
@@ -66 +111 @@
-FF_SENSOR_SHORT_PKT_T p;
-char node_name[MAX_NODE_LEN];
-char buf[1024];
-char timeStr[64];
-time_t timestamp;
@@ -73 +117 @@
-for(i=0; i<gw_pkt->num_msgs; i++ )
-  {
-   printf( "process %d\n",i );
-        sensor_short_pkt_get(&p, gw_pkt->payload, i);
-        printf( "s1 " );
-        sprintf(node_name,"%02x%02x%02x%02x",gw_pkt->subnet_mac[2],
-                gw_pkt->subnet_mac[1],
-                gw_pkt->subnet_mac[0],
-                p.mac_addr); 
-        printf( "s2 " );
-        if(debug_txt_flag==1) printf( "Data for node: %s\n",node_name );
-        // Check nodes and add them if need be
@@ -87 +128 @@
-        time(&timestamp);
-        strftime(timeStr,100,"%Y-%m-%d %X",localtime(&timestamp));
-        printf( "s3 " );
-
-        error=0;
@@ -100 +140 @@
-        }
-
-        printf( "s4 " );
-        if(error==0)
-        {
@@ -109 +148 @@
-        }       
-  }
-printf( "done\n" );
-}
-