From 49b32328744f64d37575a39f9837c3d4d2b557c8 Mon Sep 17 00:00:00 2001 From: frekky Date: Mon, 5 Oct 2015 10:33:16 +0800 Subject: [PATCH] Fixed ping userid validation --- src/server.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/server.c b/src/server.c index dc36779..3362648 100644 --- a/src/server.c +++ b/src/server.c @@ -1637,6 +1637,13 @@ handle_null_request(int tun_fd, int dns_fd, struct dnsfd *dns_fds, struct query return; } + /* Check userid */ + userid = unpacked[0]; + if (check_authenticated_user_and_ip(userid, q) != 0) { + write_dns(dns_fd, q, "BADIP", 5, 'T'); + return; /* illegal id */ + } + #ifdef DNSCACHE_LEN /* Check if cached */ if (answer_from_dnscache(dns_fd, userid, q)) @@ -1648,13 +1655,6 @@ handle_null_request(int tun_fd, int dns_fd, struct dnsfd *dns_fds, struct query return; #endif - /* Ping packet, store userid */ - userid = unpacked[0]; - if (check_authenticated_user_and_ip(userid, q) != 0) { - write_dns(dns_fd, q, "BADIP", 5, 'T'); - return; /* illegal id */ - } - dn_ack = ((unpacked[8] >> 2) & 1) ? unpacked[1] : -1; up_winsize = unpacked[2]; dn_winsize = unpacked[3]; @@ -1732,7 +1732,7 @@ handle_null_request(int tun_fd, int dns_fd, struct dnsfd *dns_fds, struct query #ifdef QMEM_LEN /* Check if cached */ if (!qmem_is_cached(dns_fd, userid, q)) - return; + qmem_append(userid, q); #endif /* Decode upstream data header - see docs/proto_XXXXXXXX.txt */ /* First byte (after userid) = CMC (ignored); skip 2 bytes */