added code to send rhizome announce packets to ARP-detected peers. #24

broadcastfilter.c

@@ -54,6 +54,31 @@ void overlay_poke_arp_peers()
 
   DEBUGF("Discovered %d peers by ARP.",peer_count);
 
+  /* Now send rhizome advertisements to them */
+
+  // initialise the packet buffer
+  struct outgoing_packet packet;
+  bzero(&packet, sizeof(struct outgoing_packet));
+  /* Interface doesn't really matter, so just lie that we are using one */
+  overlay_init_packet(&packet, &overlay_interfaces[0], 1);
+
+  /* Stuff more payloads from queues and send it */
+  overlay_rhizome_add_advertisements(packet.i,packet.buffer);
+
+  int i;
+  for(i=0;i<peer_count;i++)
+    {
+      struct sockaddr_in addr;
+      addr.sin_family=AF_INET;
+      addr.sin_port=htons(PORT_DNA);
+      addr.sin_addr=peers[i];
+      overlay_broadcast_ensemble(packet.i,&addr,packet.buffer->bytes,
+				 packet.buffer->position);
+    }
+  ob_free(packet.buffer);
+  overlay_address_clear();
+
+  /* Schedule ourselves to run periodically */
   bzero(&alarm,sizeof(alarm));
   alarm.alarm =  gettime_ms()+ 1000;
   alarm.deadline = gettime_ms()+ 1000;

overlay_interface.c

@@ -55,14 +55,6 @@ struct sched_ent sock_any;
 struct sockaddr_in sock_any_addr;
 struct profile_total sock_any_stats;
 
-struct outgoing_packet{
-  overlay_interface *interface;
-  int i;
-  int unicast;
-  struct sockaddr_in dest;
-  struct overlay_buffer *buffer;
-};
-
 struct sched_ent next_packet;
 struct profile_total send_packet;
 
@@ -689,7 +681,7 @@ void overlay_dummy_poll(struct sched_ent *alarm)
   return ;
 }
 
-static int
+int
 overlay_broadcast_ensemble(int interface_number,
 			   struct sockaddr_in *recipientaddr,
 			   unsigned char *bytes,int len)
@@ -989,7 +981,7 @@ overlay_queue_dump(overlay_txqueue *q)
 }
 #endif // 0
 
-static void
+void
 overlay_init_packet(struct outgoing_packet *packet, overlay_interface *interface, int tick){
   packet->interface = interface;
   packet->i = (interface - overlay_interfaces);

serval.h

@@ -188,7 +188,6 @@ extern char *instrumentation_file;
 extern char *batman_socket;
 extern char *batman_peerfile;
 
-
 struct subscriber;
 
 typedef struct keypair {
@@ -417,6 +416,18 @@ typedef struct overlay_peer {
 
 extern overlay_peer overlay_peers[OVERLAY_MAX_PEERS];
 
+struct outgoing_packet{
+  overlay_interface *interface;
+  int i;
+  int unicast;
+  struct sockaddr_in dest;
+  struct overlay_buffer *buffer;
+};
+int overlay_broadcast_ensemble(int interface_number,
+			       struct sockaddr_in *recipientaddr,
+			       unsigned char *bytes,int len);
+void overlay_init_packet(struct outgoing_packet *packet, 
+			 overlay_interface *interface, int tick);
 
 typedef struct overlay_txqueue {
   struct overlay_frame *first;
@@ -934,7 +945,6 @@ void dump_stack();
 #define RETURNNULL { OUT() return(NULL); }
 
 
-
 int olsr_init_socket(void);
 int olsr_send(struct overlay_frame *frame);