Commit 6a7b3338 authored by Juliusz Chroboczek's avatar Juliusz Chroboczek

Rename max_hopcount to max_request_hopcount.

parent 0557e79f
...@@ -64,7 +64,7 @@ int wired_hello_interval = -1; ...@@ -64,7 +64,7 @@ int wired_hello_interval = -1;
int idle_hello_interval = -1; int idle_hello_interval = -1;
int update_interval = -1; int update_interval = -1;
int max_hopcount = 65; int max_request_hopcount = 65;
struct network nets[MAXNETS]; struct network nets[MAXNETS];
int numnets = 0; int numnets = 0;
...@@ -758,7 +758,7 @@ expire_routes(void) ...@@ -758,7 +758,7 @@ expire_routes(void)
if(route->installed && route->refmetric < INFINITY) { if(route->installed && route->refmetric < INFINITY) {
if(route->time < now.tv_sec - MAX(5, route_timeout_delay - 25)) if(route->time < now.tv_sec - MAX(5, route_timeout_delay - 25))
send_unicast_request(route->nexthop, route->dest, send_unicast_request(route->nexthop, route->dest,
max_hopcount, -1); max_request_hopcount, -1);
} }
i++; i++;
} }
......
...@@ -98,7 +98,7 @@ extern int protocol_port; ...@@ -98,7 +98,7 @@ extern int protocol_port;
extern unsigned char protocol_group[16]; extern unsigned char protocol_group[16];
extern int protocol_socket; extern int protocol_socket;
extern int kernel_socket; extern int kernel_socket;
extern int max_hopcount; extern int max_request_hopcount;
int network_idle(struct network *net); int network_idle(struct network *net);
void update_hello_interval(struct network *net); void update_hello_interval(struct network *net);
...@@ -103,7 +103,7 @@ flush_route(struct route *route) ...@@ -103,7 +103,7 @@ flush_route(struct route *route)
} }
if(oldmetric < INFINITY && if(oldmetric < INFINITY &&
(!new_route || new_route->metric >= INFINITY)) (!new_route || new_route->metric >= INFINITY))
send_request(NULL, route->dest, max_hopcount, -1); send_request(NULL, route->dest, max_request_hopcount, -1);
} }
} }
...@@ -435,7 +435,7 @@ send_triggered_update(struct route *route, int oldmetric) ...@@ -435,7 +435,7 @@ send_triggered_update(struct route *route, int oldmetric)
if(oldmetric < INFINITY) { if(oldmetric < INFINITY) {
if(route->metric >= INFINITY) { if(route->metric >= INFINITY) {
/* We just lost a route, request a new seqno from the source */ /* We just lost a route, request a new seqno from the source */
send_request(NULL, route->dest, max_hopcount, -1); send_request(NULL, route->dest, max_request_hopcount, -1);
} else if(route->metric - oldmetric >= 384) { } else if(route->metric - oldmetric >= 384) {
/* This route's metric has increased a lot -- let's hope we find /* This route's metric has increased a lot -- let's hope we find
something better */ something better */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment