ua1zbe
/
aprsc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed ,qAI login processing - don't do it for UDP core peers 

since we don't know their usernames anyway.
Added test case within 61udp-peer.t.
This commit is contained in:
Heikki Hannikainen 2012-10-07 14:26:50 +03:00
parent 9c6cf95d73
commit 3fe8cad58c
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/parse_qc.c
View File

@ -218,6 +218,7 @@ static int q_dropcheck( struct client_t *c, const char *pdata, char *new_q, int
/* we replace the existing Q construct with a regenerated one */
*q_replace = q_start+1;
//hlog(LOG_DEBUG, "qAI: not INPORT, appending ,username %s", c->username);
/* copy over existing qAI trace */
new_q_len = path_end - q_start - 1;
//hlog(LOG_DEBUG, "qAI replacing, new_q_len %d", new_q_len);
@ -229,15 +230,14 @@ static int q_dropcheck( struct client_t *c, const char *pdata, char *new_q, int
}
memcpy(new_q, q_start+1, new_q_len);
//hlog(LOG_DEBUG, "qAI first memcpy done, new_q_len %d, q_replace %d", new_q_len, *q_replace);
//hlog(LOG_DEBUG, "qAI first memcpy done, new_q_len %d, q_replace %d, new_q %.*s", new_q_len, *q_replace, new_q_len, new_q);
/* If the packet is from a verified port where the login is not found after the q construct */
if (c->validated && !login_in_path) {
/* If the packet is from a verified port where the login is not found after the q construct,
* append ,login
* - but not if this is an UDP core peer, and we don't know the username */
if (c->validated && !login_in_path && c->state != CSTATE_COREPEER) {
/* Append ,login */
new_q_len += snprintf(new_q + new_q_len, new_q_size - new_q_len, ",%s", c->username);
} else if (!(c->flags & CLFLAGS_INPORT) && !login_in_path) {
/* from an outbound connection, append client's hexaddr */
//hlog(LOG_DEBUG, "qAI appending hex address, starting at %d, got %d left in buffer", new_q_len, new_q_size - new_q_len);
//hlog(LOG_DEBUG, "qAI: from validated client, login not in path, appending ,username %s", c->username);
new_q_len += snprintf(new_q + new_q_len, new_q_size - new_q_len, ",%s", c->username);
}
//hlog(LOG_DEBUG, "qAI append done, new_q_len %d, new_q_size %d, q_replace %d, going to append %d more", new_q_len, new_q_size, *q_replace, strlen(serverid)+1);
@ -249,6 +249,7 @@ static int q_dropcheck( struct client_t *c, const char *pdata, char *new_q, int
/* Append ,SERVERLOGIN */
new_q_len += snprintf(new_q + new_q_len, new_q_size - new_q_len, ",%s", serverid);
//hlog(LOG_DEBUG, "qAI: complete, new_q %s", new_q);
}
return new_q_len;

2
tests/libperl/istest.pm
View File

@ -45,6 +45,8 @@ sub txrx($$$$$)
return;
}
#warn "received '$rx'\n";
if ($received ne $rx) {
&$ok($received, $rx, "Server returned wrong line");
return;

11
tests/t/61udp-peer.t
View File

@ -13,7 +13,7 @@
#
use Test;
BEGIN { plan tests => 9 + 4 + 2 };
BEGIN { plan tests => 9 + 5 + 2 };
use runproduct;
use istest;
use Ham::APRS::IS;
@ -62,8 +62,13 @@ my $s;
$s = "SRC>DST,qAR,IGATE:upstream to client";
istest::txrx(\&ok, $is1, $client, $s, $s);
# 2) from core peer to client
$s = "SRC>DST,qAR,IGATE:core peer to client";
# 2) from core peer to client, with trace
$s = "SRC>DST,qAI,IGATE,SRV1:core peer to client, 1";
my $rx = "SRC>DST,qAI,IGATE,SRV1,TESTING:core peer to client, 1";
istest::txrx(\&ok, $udp, $client, $s, $rx);
# 3) from core peer to client
$s = "SRC>DST,qAR,IGATE:core peer to client, 2";
istest::txrx(\&ok, $udp, $client, $s, $s);
# 4) from client to peers and upstreams