Add auto-routing for RF24Ethernet

RF24Tun now handles ARP requests, and broacasts as required to find the
IP of related devices, using RF24Network multicast
- IP payloads are delivered according to MAC (RF24Network/RF24) address
- This allows multiple RF24Ethernet nodes to be connected entirely using
TCP/IP

Author: TMRh20

Message.h

@@ -64,8 +64,8 @@ class Message {
     * Get the payload of the message as a char array
     * @return the payload as a c-string
     */
-    const char* getPayload() {
-        const char* res = payload_.data();
+    uint8_t* getPayload() {
+        uint8_t* res = payload_.data();
         return res;
     };
 
@@ -82,14 +82,14 @@ class Message {
     * @param buffer char array as the payload
     * @param bsize size of the buffer
     */
-    void setPayload(char * buffer, std::size_t bsize) {
+    void setPayload(uint8_t * buffer, std::size_t bsize) {
         payload_.clear();
         payload_.assign(buffer, buffer + bsize);
         length_ = payload_.size();
     };
 
   private:
-    std::vector<char> payload_;  /**< Internal vector data structure to save the payload*/
+    std::vector<uint8_t> payload_;  /**< Internal vector data structure to save the payload*/
     std::size_t length_;  /**< Current length of the payload */
     uint8_t seqNo_;  /**< Sequence number */
 

ThreadSafeQueue.h

@@ -33,4 +33,9 @@ class ThreadSafeQueue {
   bool empty() {
     return q_.empty();
   }
+  
+  size_t size() {
+    return q_.size();
+  }
+  
 };

rf24totun.cpp

@@ -144,7 +144,7 @@ void radioRxTxThreadFunction() {
 
             RF24NetworkHeader header;        // If so, grab it and print it out
             Message msg;
-            char buffer[MAX_PAYLOAD_SIZE];
+            uint8_t buffer[MAX_PAYLOAD_SIZE];
 
             unsigned int bytesRead = network.read(header,buffer,MAX_PAYLOAD_SIZE);
             if (bytesRead > 0) {
@@ -176,12 +176,59 @@ void radioRxTxThreadFunction() {
                 std::cout << std::endl; //PrintDebug == 1 does not have an endline.
                 printPayload(msg.getPayloadStr(),"radio TX");
             }
-            const uint16_t other_node = otherNodeAddr;
-            RF24NetworkHeader header(/*to node*/ other_node, EXTERNAL_DATA_TYPE);
-            bool ok = network.write(header,msg.getPayload(),msg.getLength());
-
+			
+			uint8_t *tmp = msg.getPayload();
+			/*printf("********WRITING************\n");
+			for(int i=0; i<8; i++){
+				//std::cout << std::hex << buffer[i] <<std::endl;
+				//printf("%#x\n",(uint8_t)buffer[i]);
+				//uint32_t tmp2 = 0;
+				//tmp2 |= (uint32_t)tmp;
+				//printf("%01x\n",tmp2);
+				printf("0%#x\n",tmp[i]);
+				//tmp++;
+			}*/
+			
+			tmp = msg.getPayload();
+			
+			uint32_t RF24_STR = 0x34324652; //Identifies the mac as an RF24 mac
+			uint32_t ARP_BC = 0xFFFFFFFF;   //Broadcast address
+			struct macStruct{
+				uint16_t rf24_Addr;
+				uint32_t rf24_Verification;								
+			};
+			
+			//struct serialip_state *s = &(uip_conn->appstate);//Creates a pointer to the application state of the current connection, which can be used to terminate it?
+			
+			macStruct macData;
+			//memcpy(&macData,tmp,sizeof(macData));
+			memcpy(&macData.rf24_Addr,tmp,2);
+			memcpy(&macData.rf24_Verification,tmp+2,4);
+            //const uint16_t other_node = otherNodeAddr;
+			
+			bool ok = 0;
+			if(macData.rf24_Verification == RF24_STR){
+				const uint16_t other_node = macData.rf24_Addr;			
+				RF24NetworkHeader header(/*to node*/ other_node, EXTERNAL_DATA_TYPE);
+				ok = network.write(header,msg.getPayload(),msg.getLength());
+				printf("*************W1\n");
+			}else
+			if(macData.rf24_Verification == ARP_BC){
+				const uint16_t other_node = otherNodeAddr;			
+				RF24NetworkHeader header(/*to node*/ 00, EXTERNAL_DATA_TYPE); //Set to master node, will be modified by RF24Network if multi-casting
+				
+				if(thisNodeAddr == 00){ //Master Node
+					ok = network.multicast(header,msg.getPayload(),msg.getLength(),1 ); //Send to Level 1
+				}else{
+					ok = network.write(header,msg.getPayload(),msg.getLength());
+				}
+				printf("*****************W2\n");
+			}
+
+			printf("Addr: 0%#x\n",macData.rf24_Addr);
+			printf("Verif: 0%#x\n",macData.rf24_Verification);
             if (ok) {
-                //std::cout << "ok." << std::endl;
+                std::cout << "ok." << std::endl;
             } else {
                 std::cerr << "failed." << std::endl;
             }
@@ -203,7 +250,7 @@ void tunRxThreadFunction() {
 
     fd_set socketSet;
     struct timeval selectTimeout;
-    char buffer[MAX_TUN_BUF_SIZE];
+    uint8_t buffer[MAX_TUN_BUF_SIZE];
     int nread;
 
     while(1) {
@@ -226,8 +273,13 @@ void tunRxThreadFunction() {
                         std::cout << "Tun: Successfully read " << nread  << " bytes from tun device" << std::endl;
                     }
                     if (PRINT_DEBUG >= 3) {
-                        printPayload(std::string(buffer, nread),"Tun read");
+                        //printPayload(std::string(buffer, nread),"Tun read");
                     }
+					
+					/*for(int i=0; i<nread; i++){
+						//std::cout << std::hex << buffer[i] <<std::endl;
+						printf("%#x\n",(uint8_t)buffer[i]);
+					}*/
 
                     // copy received data into new Message
                     Message msg;

rf24totun_configAndPing.sh

@@ -37,6 +37,8 @@ if [[ -z "${1##*[!0-9]*}" ]] || [[ -z "${2##*[!0-9]*}" ]]; then
 fi
 
 INTERFACE="tun_nrf24"
+#MYIP="10.10.2.${1}/16"
+#PINGIP="10.10.2.${2}"
 MYIP="192.168.1.${1}/24"
 PINGIP="192.168.1.${2}"
 MTU=1500