From 35e87b903e08fc51975a8cc97f06251d5153a424 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Mon, 14 Sep 2009 23:06:00 +0200 Subject: [PATCH] Use only rand(), not random(). We used both rand() and random() in our code. Since it returns an int, we have to use %x in our format strings instead of %lx. This fixes a crash under Windows when cross-compiling tinc with a recent version of MinGW. --- src/net_packet.c | 2 +- src/protocol_edge.c | 4 ++-- src/protocol_key.c | 2 +- src/protocol_subnet.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/net_packet.c b/src/net_packet.c index 31c44771..2be599eb 100644 --- a/src/net_packet.c +++ b/src/net_packet.c @@ -87,7 +87,7 @@ void send_mtu_probe(node_t *n) return; } - len = n->minmtu + 1 + random() % (n->maxmtu - n->minmtu); + len = n->minmtu + 1 + rand() % (n->maxmtu - n->minmtu); if(len < 64) len = 64; diff --git a/src/protocol_edge.c b/src/protocol_edge.c index 0db3e7b7..4066a30d 100644 --- a/src/protocol_edge.c +++ b/src/protocol_edge.c @@ -45,7 +45,7 @@ bool send_add_edge(connection_t *c, const edge_t *e) sockaddr2str(&e->address, &address, &port); - x = send_request(c, "%d %lx %s %s %s %s %lx %d", ADD_EDGE, random(), + x = send_request(c, "%d %x %s %s %s %s %lx %d", ADD_EDGE, rand(), e->from->name, e->to->name, address, port, e->options, e->weight); free(address); @@ -178,7 +178,7 @@ bool send_del_edge(connection_t *c, const edge_t *e) { cp(); - return send_request(c, "%d %lx %s %s", DEL_EDGE, random(), + return send_request(c, "%d %x %s %s", DEL_EDGE, rand(), e->from->name, e->to->name); } diff --git a/src/protocol_key.c b/src/protocol_key.c index 41479148..7ae98036 100644 --- a/src/protocol_key.c +++ b/src/protocol_key.c @@ -49,7 +49,7 @@ bool send_key_changed() if(!mykeyused) return true; - return send_request(broadcast, "%d %lx %s", KEY_CHANGED, random(), myself->name); + return send_request(broadcast, "%d %x %s", KEY_CHANGED, rand(), myself->name); } bool key_changed_h(connection_t *c) diff --git a/src/protocol_subnet.c b/src/protocol_subnet.c index d40b3a33..b50cf6a3 100644 --- a/src/protocol_subnet.c +++ b/src/protocol_subnet.c @@ -42,7 +42,7 @@ bool send_add_subnet(connection_t *c, const subnet_t *subnet) if(!net2str(netstr, sizeof netstr, subnet)) return false; - return send_request(c, "%d %lx %s %s", ADD_SUBNET, random(), subnet->owner->name, netstr); + return send_request(c, "%d %x %s %s", ADD_SUBNET, rand(), subnet->owner->name, netstr); } bool add_subnet_h(connection_t *c) @@ -161,7 +161,7 @@ bool send_del_subnet(connection_t *c, const subnet_t *s) if(!net2str(netstr, sizeof netstr, s)) return false; - return send_request(c, "%d %lx %s %s", DEL_SUBNET, random(), s->owner->name, netstr); + return send_request(c, "%d %x %s %s", DEL_SUBNET, rand(), s->owner->name, netstr); } bool del_subnet_h(connection_t *c) -- 2.20.1