Add a parameter ``urgent'' to send_update.

babel.c

@@ -502,7 +502,7 @@ main(int argc, char **argv)
                 send_ihu(NULL, &nets[i]);
             if(!network_idle(&nets[i])) {
                 if(now.tv_sec >= nets[i].update_time + update_interval)
-                    send_update(&nets[i], NULL, 0);
+                    send_update(&nets[i], 0, NULL, 0);
                 if(now.tv_sec >=
                    nets[i].self_update_time + nets[i].self_update_interval) {
                     send_self_update(&nets[i], 0);
@@ -533,7 +533,7 @@ main(int argc, char **argv)
         /* Uninstall and retract all routes. */
         if(routes[i].installed) {
             uninstall_route(&routes[i]);
-            send_update(NULL, routes[i].src->prefix, routes[i].src->plen);
+            send_update(NULL, 1, routes[i].src->prefix, routes[i].src->plen);
         }
     }
     for(i = 0; i < numnets; i++) {

message.c

@@ -150,9 +150,9 @@ parse_packet(const unsigned char *from, struct network *net,
                     /* If a neighbour is requesting a full route dump from us,
                        we might as well send it an ihu. */
                     send_ihu(neigh, NULL);
-                    send_update(neigh->network, NULL, 0);
+                    send_update(neigh->network, 0, NULL, 0);
                 } else {
-                    send_update(neigh->network, address, plen);
+                    send_update(neigh->network, 1, address, plen);
                 }
             } else if(type == 3) {
                 if(plen == 0xFF)
@@ -556,14 +556,14 @@ buffer_update(struct network *net,
 }
 
 void
-send_update(struct network *net,
+send_update(struct network *net, int urgent,
             const unsigned char *prefix, unsigned char plen)
 {
     int i;
 
     if(net == NULL) {
         for(i = 0; i < numnets; i++)
-            send_update(&nets[i], prefix, plen);
+            send_update(&nets[i], urgent, prefix, plen);
         return;
     }
 
@@ -582,7 +582,7 @@ send_update(struct network *net,
     if(prefix) {
         if(updates > net->bufsize / 24 - 2) {
             /* Update won't fit in a single packet -- send a full dump. */
-            send_update(net, NULL, 0);
+            send_update(net, urgent, NULL, 0);
             return;
         }
         debugf("Sending update to %s for %s.\n",
@@ -622,9 +622,8 @@ send_self_update(struct network *net, int force_seqno)
 
     for(i = 0; i < numxroutes; i++) {
         if(xroutes[i].exported)
-            send_update(net, xroutes[i].prefix, xroutes[i].plen);
+            send_update(net, 0, xroutes[i].prefix, xroutes[i].plen);
     }
-    schedule_update_flush(net);
 }
 
 void
@@ -659,7 +658,7 @@ send_neighbour_update(struct neighbour *neigh, struct network *net)
     int i;
     for(i = 0; i < numroutes; i++) {
         if(routes[i].installed && routes[i].nexthop == neigh)
-            send_update(net, routes[i].src->prefix, routes[i].src->plen);
+            send_update(net, 0, routes[i].src->prefix, routes[i].src->plen);
     }
 }
 

message.h

@@ -44,7 +44,7 @@ void send_request(struct network *net,
                   const unsigned char *prefix, unsigned char plen);
 void send_unicast_request(struct neighbour *neigh,
                   const unsigned char *prefix, unsigned char plen);
-void send_update(struct network *net,
+void send_update(struct network *net, int urgent,
                  const unsigned char *prefix, unsigned char plen);
 void send_self_update(struct network *net, int force_seqno);
 void send_self_retract(struct network *net);

route.c

@@ -435,7 +435,7 @@ consider_route(struct route *route)
     if(installed && route->installed)
         send_triggered_update(route, installed->src, installed->metric);
     else
-        send_update(NULL, route->src->prefix, route->src->plen);
+        send_update(NULL, 0, route->src->prefix, route->src->plen);
     return;
 }
 
@@ -450,7 +450,8 @@ send_triggered_update(struct route *route, struct source *oldsrc, int oldmetric)
     if(route->src != oldsrc ||
        ((route->metric >= INFINITY) != (oldmetric >= INFINITY)) ||
        (route->metric >= oldmetric + 256 || oldmetric >= route->metric + 256))
-        send_update(NULL, route->src->prefix, route->src->plen);
+        send_update(NULL, ((route->metric >= INFINITY) || route->src != oldsrc),
+                    route->src->prefix, route->src->plen);
 
     if(oldmetric < INFINITY) {
         if(route->metric >= INFINITY || route->metric - oldmetric >= 384)
@@ -495,7 +496,7 @@ route_lost(struct source *src, int oldmetric)
         consider_route(new_route);
     } else {
         /* Complain loudly. */
-        send_update(NULL, src->prefix, src->plen);
+        send_update(NULL, 1, src->prefix, src->plen);
         if(oldmetric < INFINITY)
             send_request(NULL, src->prefix, src->plen);
     }