Changeset 566
- Timestamp:
- 05/01/08 20:35:13 (2 weeks ago)
- Files:
-
- nano-RK/projects/SAMPL/client/aggregate.c (modified) (1 diff)
- nano-RK/projects/SAMPL/client/p2p_handler.c (modified) (5 diffs)
- nano-RK/projects/SAMPL/slip-clients/xmpp-client/ff_config.txt (modified) (1 diff)
- nano-RK/projects/SAMPL/slip-clients/xmpp-client/lm-library.c (deleted)
- nano-RK/projects/SAMPL/slip-clients/xmpp-client/lm-library.h (deleted)
- nano-RK/projects/SAMPL/slip-clients/xmpp-client/main.c (modified) (1 diff)
- nano-RK/projects/SAMPL/slip-clients/xmpp-client/makefile (modified) (1 diff)
- nano-RK/projects/SAMPL/slip-clients/xmpp-client/node_list.h (modified) (1 diff)
- nano-RK/projects/SAMPL/slip-clients/xmpp-client/xmpp_pkt_writer.c (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
nano-RK/projects/SAMPL/client/aggregate.c
r549 r566 77 77 if((us_pkt_in->ctrl_flags & ENCRYPT) !=0 ) us_pkt->ctrl_flags |= ENCRYPT; 78 78 us_pkt->ack_retry= us_pkt_in->ack_retry; 79 us_pkt->subnet_mac[0] = us_pkt_in->subnet_mac[0]; 80 us_pkt->subnet_mac[1] = us_pkt_in->subnet_mac[1]; 81 us_pkt->subnet_mac[2] = us_pkt_in->subnet_mac[2]; 79 //us_pkt->subnet_mac[0] = us_pkt_in->subnet_mac[0]; 80 //us_pkt->subnet_mac[1] = us_pkt_in->subnet_mac[1]; 81 //us_pkt->subnet_mac[2] = us_pkt_in->subnet_mac[2]; 82 us_pkt->subnet_mac[0] = my_subnet_mac[0]; 83 us_pkt->subnet_mac[1] = my_subnet_mac[1]; 84 us_pkt->subnet_mac[2] = my_subnet_mac[2]; 82 85 us_pkt->priority = us_pkt_in->priority; 83 86 us_pkt->error_code = us_pkt_in->error_code; nano-RK/projects/SAMPL/client/p2p_handler.c
r558 r566 41 41 42 42 43 p2p_pkt_out->subnet_mac[0] = my_subnet_mac[0];44 p2p_pkt_out->subnet_mac[1] = my_subnet_mac[1];45 p2p_pkt_out->subnet_mac[2] = my_subnet_mac[2];43 p2p_pkt_out->subnet_mac[0] = p2p_pkt_in->subnet_mac[0]; 44 p2p_pkt_out->subnet_mac[1] = p2p_pkt_in->subnet_mac[1]; 45 p2p_pkt_out->subnet_mac[2] = p2p_pkt_in->subnet_mac[2]; 46 46 p2p_pkt_out->src_mac = p2p_pkt_in->src_mac; 47 47 p2p_pkt_out->dst_mac = p2p_pkt_in->dst_mac; … … 73 73 case PING_PKT: 74 74 // setup 1-hop reply (change below for packet specific mods) 75 p2p_pkt_out->ctrl_flags = 0; 75 76 p2p_pkt_out->ttl = 1; 77 p2p_pkt_out->subnet_mac[0] = my_subnet_mac[0]; 78 p2p_pkt_out->subnet_mac[1] = my_subnet_mac[1]; 79 p2p_pkt_out->subnet_mac[2] = my_subnet_mac[2]; 76 80 p2p_pkt_out->src_mac = my_mac; 77 81 p2p_pkt_out->dst_mac = p2p_pkt_in->src_mac; … … 83 87 case DATA_STORAGE_PKT: 84 88 // setup 1-hop reply (change below for packet specific mods) 89 p2p_pkt_out->ctrl_flags = 0; 85 90 p2p_pkt_out->ttl = 1; 91 p2p_pkt_out->subnet_mac[0] = my_subnet_mac[0]; 92 p2p_pkt_out->subnet_mac[1] = my_subnet_mac[1]; 93 p2p_pkt_out->subnet_mac[2] = my_subnet_mac[2]; 86 94 p2p_pkt_out->src_mac = my_mac; 87 95 p2p_pkt_out->dst_mac = p2p_pkt_in->src_mac; … … 107 115 #endif 108 116 // No clue what this packet is, so just forward it 109 p2p_pkt_out->subnet_mac[0] = p2p_pkt_in->subnet_mac[0];110 p2p_pkt_out->subnet_mac[1] = p2p_pkt_in->subnet_mac[1];111 p2p_pkt_out->subnet_mac[2] = p2p_pkt_in->subnet_mac[2];112 117 for(i=0; i<p2p_pkt_in->payload_len; i++ ) 113 118 p2p_pkt_out->payload[i]=p2p_pkt_in->payload[i]; … … 121 126 // If the packet isn't for my handler, just copy it for forwarding 122 127 // Routing should have been correctly set above 123 p2p_pkt_out->subnet_mac[0] = p2p_pkt_in->subnet_mac[0];124 p2p_pkt_out->subnet_mac[1] = p2p_pkt_in->subnet_mac[1];125 p2p_pkt_out->subnet_mac[2] = p2p_pkt_in->subnet_mac[2];126 128 for(i=0; i<p2p_pkt_in->payload_len; i++ ) 127 129 p2p_pkt_out->payload[i]=p2p_pkt_in->payload[i]; nano-RK/projects/SAMPL/slip-clients/xmpp-client/ff_config.txt
r559 r566 29 29 # 0x01 0x01 0xb9 0x07 0x00 0xf0 0x00 0x00 0x00 0x00 0x00 0x06 0x01 0x78 0x64 0xd3 0x00 0x00 0x00 0x00 0x00 30 30 # 0x01 0x01 0xb9 0x07 0x00 0xf0 0x00 0x00 0x00 0x00 0x00 0x06 0x01 0x78 0x64 0xd3 0x00 0x00 0x00 0x00 0x00 31 0x01 0x01 0xb9 0x07 0x00 0xf0 0x00 0x00 0x00 0x00 0x00 0x06 0x01 0x 10 0x32 0xd3 0x00 0x00 0x00 0x00 0x0031 0x01 0x01 0xb9 0x07 0x00 0xf0 0x00 0x00 0x00 0x00 0x00 0x06 0x01 0xf0 0x32 0xd3 0x00 0x00 0x00 0x00 0x00 32 32 nano-RK/projects/SAMPL/slip-clients/xmpp-client/main.c
r559 r566 10 10 #include "../../include/sampl.h" 11 11 #include <slipstream.h> 12 #include "lm-library.h"12 #include <lm-library.h> 13 13 #include "node_list.h" 14 14 #include "globals.h" nano-RK/projects/SAMPL/slip-clients/xmpp-client/makefile
r513 r566 1 LM_PATH_PREFIX=/usr/local/include/ 1 XMPP_LIBRARY_PATH=/home/agr/xmpp/xmpp_lib_c/ 2 include $(XMPP_LIBRARY_PATH)/vars.mk 3 2 4 CC=gcc 3 LIBS=-lglib-2.0 -lloudmouth-1 4 INCLUDE=-I. -I/opt/gnome/include/glib-2.0/ -I/opt/gnome/lib/glib-2.0/include/ -I$(LM_PATH_PREFIX)/loudmouth-1.0/ -I../../include/ -I../../app_pkt_handlers/ 5 # INCLUDE=-I. -I/usr/include/glib-2.0/ -I/usr/lib/glib-2.0/include/ -I$(LM_PATH_PREFIX)/loudmouth-1.0/ 5 LIBS=-llm-library 6 INCLUDE=-I. -I$(GLIB_INCLUDE) -I$(GLIB_LIB_INCLUDE) -I$(LOUDMOUTH_INCLUDE) -I$(XMPP_LIBRARY_PATH) -I../../include/ -I../../app_pkt_handlers/ 6 7 7 8 CFLAGS=-Wall $(INCLUDE) 8 LDFLAGS=-L. -L /opt/gnome/lib$(LIBS)9 SOURCES= lm-library.cmain.c slipstream.c ../../include/pkt_packer.c node_list.c ../../app_pkt_handlers/ping_pkt.c ../../app_pkt_handlers/xmpp_pkt.c ../../app_pkt_handlers/ack_pkt.c xmpp_pkt_writer.c ../../app_pkt_handlers/ff_basic_sensor_pkt.c9 LDFLAGS=-L. -L$(XMPP_LIBRARY_PATH) $(LIBS) 10 SOURCES=main.c slipstream.c ../../include/pkt_packer.c node_list.c ../../app_pkt_handlers/ping_pkt.c ../../app_pkt_handlers/xmpp_pkt.c ../../app_pkt_handlers/ack_pkt.c xmpp_pkt_writer.c ../../app_pkt_handlers/ff_basic_sensor_pkt.c 10 11 OBJS=$(SOURCES:.c=.o) 11 12 nano-RK/projects/SAMPL/slip-clients/xmpp-client/node_list.h
r495 r566 4 4 5 5 #define MAX_NODE_LEN 32 6 #define MAX_NODE_ELEMENTS 326 #define MAX_NODE_ELEMENTS 64 7 7 8 8 nano-RK/projects/SAMPL/slip-clients/xmpp-client/xmpp_pkt_writer.c
r559 r566 18 18 char node_name[MAX_NODE_LEN]; 19 19 20 if(gw_pkt->payload_len==0) 21 { 22 if(debug_txt_flag) printf( "Malformed packet!\n" ); 23 return; 24 } 25 26 20 27 xmpp_pkt_unpack(&p, gw_pkt->payload, 0); 21 28 sprintf(node_name,"%02x%02x%02x%02x",gw_pkt->subnet_mac[2], … … 33 40 { 34 41 char node_name[MAX_NODE_LEN]; 42 char publisher_node_name[MAX_NODE_LEN]; 35 43 uint8_t num_msgs,i; 36 44 char timeStr[64]; 37 45 time_t timestamp; 38 int8_t rssi ;46 int8_t rssi,ret; 39 47 40 sprintf(node_name,"%02x%02x%02x%02x",gw_pkt->subnet_mac[2], 48 if(gw_pkt->payload_len==0) 49 { 50 if(debug_txt_flag) printf( "Malformed packet!\n" ); 51 return; 52 } 53 54 55 sprintf(publisher_node_name,"%02x%02x%02x%02x",gw_pkt->subnet_mac[2], 41 56 gw_pkt->subnet_mac[1], 42 57 gw_pkt->subnet_mac[0], 43 58 gw_pkt->src_mac); 44 59 if(debug_txt_flag==1) printf( "Data for node: %s\n",publisher_node_name ); 45 60 // Check nodes and add them if need be 46 if(xmpp_flag==1) check_and_create_node( node_name);61 if(xmpp_flag==1) check_and_create_node(publisher_node_name); 47 62 // publish XML data for node 48 63 time(×tamp); 49 64 strftime(timeStr,100,"%Y-%m-%d %X",localtime(×tamp)); 50 65 51 sprintf(buf,"<Node id=\"%s\" type=\"FIREFLY\" timestamp=\"%s\">", node_name,timeStr );66 sprintf(buf,"<Node id=\"%s\" type=\"FIREFLY\" timestamp=\"%s\">", publisher_node_name,timeStr ); 52 67 53 68 num_msgs=gw_pkt->payload[0]; … … 65 80 66 81 if(debug_txt_flag==1 ) printf( "Publish: %s\n",buf); 67 // if(xmpp_flag==1 ) ret = publish_to_node(node_name,buf);68 //if(xmpp_flag && ret!=XMPP_NO_ERROR) printf( "XMPP Error: %s\n",ERROR_MESSAGE(ret));82 if(xmpp_flag==1 ) ret = publish_to_node(publisher_node_name,buf); 83 if(xmpp_flag && ret!=XMPP_NO_ERROR) printf( "XMPP Error: %s\n",ERROR_MESSAGE(ret)); 69 84 70 85 … … 82 97 time_t timestamp; 83 98 int i,ret; 99 100 return; 101 102 if(gw_pkt->payload_len==0) 103 { 104 if(debug_txt_flag) printf( "Malformed packet!\n" ); 105 return; 106 } 84 107 85 108 for(i=0; i<gw_pkt->num_msgs; i++ ) … … 114 137 time_t timestamp; 115 138 int i,ret,error; 139 140 if(gw_pkt->payload_len==0) 141 { 142 if(debug_txt_flag) printf( "Malformed packet!\n" ); 143 return; 144 } 145 116 146 117 147 for(i=0; i<gw_pkt->num_msgs; i++ )