From aeaeac8a79363f3d8a97e5850e1defd99443a80d Mon Sep 17 00:00:00 2001 From: Jeremy Lakeman Date: Mon, 26 Nov 2012 15:17:43 +1030 Subject: [PATCH] No broadcast id required for single hop --- overlay_advertise.c | 5 +---- overlay_packetformats.c | 5 +---- rhizome_packetformats.c | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/overlay_advertise.c b/overlay_advertise.c index b38e8ced..a8a02deb 100644 --- a/overlay_advertise.c +++ b/overlay_advertise.c @@ -121,12 +121,9 @@ int overlay_route_add_advertisements(struct decode_context *context, overlay_int ob_checkpoint(e); - struct broadcast broadcast; - overlay_broadcast_generate_address(&broadcast); - if (overlay_frame_build_header(context, e, 0, OF_TYPE_NODEANNOUNCE, 0, 1, - &broadcast, NULL, + NULL, NULL, NULL, my_subscriber)) return -1; diff --git a/overlay_packetformats.c b/overlay_packetformats.c index 66ecf03b..d77a5b51 100644 --- a/overlay_packetformats.c +++ b/overlay_packetformats.c @@ -368,12 +368,9 @@ int overlay_add_selfannouncement(struct decode_context *context, int interface,s time_ms_t now = gettime_ms(); - struct broadcast broadcast_id; - overlay_broadcast_generate_address(&broadcast_id); - if (overlay_frame_build_header(context, b, 0, OF_TYPE_SELFANNOUNCE, 0, 1, - &broadcast_id, NULL, + NULL, NULL, NULL, my_subscriber)) return -1; diff --git a/rhizome_packetformats.c b/rhizome_packetformats.c index da185e5c..1d5e2743 100644 --- a/rhizome_packetformats.c +++ b/rhizome_packetformats.c @@ -157,12 +157,9 @@ int overlay_rhizome_add_advertisements(struct decode_context *context, int inter if (slots<1) { RETURN(WHY("No room for node advertisements")); } - struct broadcast broadcast_id; - overlay_broadcast_generate_address(&broadcast_id); - if (overlay_frame_build_header(context, e, 0, OF_TYPE_RHIZOME_ADVERT, 0, 1, - &broadcast_id, NULL, + NULL, NULL, NULL, my_subscriber)) return -1;