j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Rename REQ_SPTPS to SPTPS_PACKET.

Browse source 
REQ_SPTPS implies the message has an ANS_ counterpart (like REQ_KEY,
ANS_KEY), but it doesn't. Therefore dropping the REQ_ seems more
appropriate, and we add a _PACKET suffix to reduce the likelihood of
naming conflicts.
This commit is contained in:
Etienne Dechamps 2015-05-10 18:05:19 +01:00
parent 10c1f60c64
commit de14308840
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/net_packet.c
View file

@ -698,7 +698,7 @@ bool send_sptps_data(node_t *to, node_t *from, int type, const void *data, size_
to->incompression = myself->incompression; to->incompression = myself->incompression;
return send_request(to->nexthop->connection, "%d %s %s %s -1 -1 -1 %d", ANS_KEY, from->name, to->name, buf, to->incompression); return send_request(to->nexthop->connection, "%d %s %s %s -1 -1 -1 %d", ANS_KEY, from->name, to->name, buf, to->incompression);
} else { } else {
return send_request(to->nexthop->connection, "%d %s %s %d %s", REQ_KEY, from->name, to->name, REQ_SPTPS, buf); return send_request(to->nexthop->connection, "%d %s %s %d %s", REQ_KEY, from->name, to->name, SPTPS_PACKET, buf);
} }
} }

2
src/protocol.c
View file

@ -53,7 +53,7 @@ static char (*request_name[]) = {
"PING", "PONG", "PING", "PONG",
"ADD_SUBNET", "DEL_SUBNET", "ADD_SUBNET", "DEL_SUBNET",
"ADD_EDGE", "DEL_EDGE", "KEY_CHANGED", "REQ_KEY", "ANS_KEY", "PACKET", "CONTROL", "ADD_EDGE", "DEL_EDGE", "KEY_CHANGED", "REQ_KEY", "ANS_KEY", "PACKET", "CONTROL",
"REQ_PUBKEY", "ANS_PUBKEY", "REQ_SPTPS", "UDP_INFO", "MTU_INFO", "REQ_PUBKEY", "ANS_PUBKEY", "SPTPS_PACKET", "UDP_INFO", "MTU_INFO",
}; };
static splay_tree_t *past_request_tree; static splay_tree_t *past_request_tree;

2
src/protocol.h
View file

@ -48,7 +48,7 @@ typedef enum request_t {
/* Tinc 1.1 requests */ /* Tinc 1.1 requests */
CONTROL, CONTROL,
REQ_PUBKEY, ANS_PUBKEY, REQ_PUBKEY, ANS_PUBKEY,
REQ_SPTPS, SPTPS_PACKET,
UDP_INFO, MTU_INFO, UDP_INFO, MTU_INFO,
LAST /* Guardian for the highest request number */ LAST /* Guardian for the highest request number */
} request_t; } request_t;

8
src/protocol_key.c
View file

@ -129,16 +129,16 @@ static bool req_key_ext_h(connection_t *c, const char *request, node_t *from, no
/* If this is a SPTPS packet, see if sending UDP info helps. /* If this is a SPTPS packet, see if sending UDP info helps.
Note that we only do this if we're the destination or the static relay; Note that we only do this if we're the destination or the static relay;
otherwise every hop would initiate its own UDP info message, resulting in elevated chatter. */ otherwise every hop would initiate its own UDP info message, resulting in elevated chatter. */
if((reqno == REQ_KEY || reqno == REQ_SPTPS) && to->via == myself) if((reqno == REQ_KEY || reqno == SPTPS_PACKET) && to->via == myself)
send_udp_info(myself, from); send_udp_info(myself, from);
if(reqno == REQ_SPTPS) { if(reqno == SPTPS_PACKET) {
/* This is a SPTPS data packet. */ /* This is a SPTPS data packet. */
char buf[MAX_STRING_SIZE]; char buf[MAX_STRING_SIZE];
int len; int len;
if(sscanf(request, "%*d %*s %*s %*d " MAX_STRING, buf) != 1 || !(len = b64decode(buf, buf, strlen(buf)))) { if(sscanf(request, "%*d %*s %*s %*d " MAX_STRING, buf) != 1 || !(len = b64decode(buf, buf, strlen(buf)))) {
logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s) to %s (%s): %s", "REQ_SPTPS", from->name, from->hostname, to->name, to->hostname, "invalid SPTPS data"); logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s) to %s (%s): %s", "SPTPS_PACKET", from->name, from->hostname, to->name, to->hostname, "invalid SPTPS data");
return true; return true;
} }
@ -149,7 +149,7 @@ static bool req_key_ext_h(connection_t *c, const char *request, node_t *from, no
} else { } else {
/* The packet is for us */ /* The packet is for us */
if(!from->status.validkey) { if(!from->status.validkey) {
logger(DEBUG_PROTOCOL, LOG_ERR, "Got REQ_SPTPS from %s (%s) but we don't have a valid key yet", from->name, from->hostname); logger(DEBUG_PROTOCOL, LOG_ERR, "Got SPTPS_PACKET from %s (%s) but we don't have a valid key yet", from->name, from->hostname);
return true; return true;
} }
sptps_receive_data(&from->sptps, buf, len); sptps_receive_data(&from->sptps, buf, len);