mirror/iodine
1
0
Fork 0
mirror of https://github.com/yarrick/iodine.git synced 2025-04-10 04:21:01 +00:00
Code Issues Projects Releases Wiki Activity

---

Browse source
This commit is contained in:
Julian Kranz 2012-01-28 15:49:53 +01:00 • committed by Barak A. Pearlmutter
parent c4a11cf849
commit 61d1439899
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/iodined.c
View file

@ -763,7 +763,7 @@ handle_null_request(int tun_fd, int dns_fd, struct query *q, int domain_len)
memcpy(&(users[userid].host.v6), &q->from.v6, sizeof(struct in6_addr)); memcpy(&(users[userid].host.v6), &q->from.v6, sizeof(struct in6_addr));
else { else {
#endif #endif
tempin = (struct sockaddr_in *) &(q->from); tempin = (struct sockaddr_in *) &(q->from.v4);
memcpy(&(users[userid].host.v4), &(tempin->sin_addr), sizeof(struct in_addr)); memcpy(&(users[userid].host.v4), &(tempin->sin_addr), sizeof(struct in_addr));
#ifdef LINUX #ifdef LINUX
} }
@ -773,8 +773,16 @@ handle_null_request(int tun_fd, int dns_fd, struct query *q, int domain_len)
users[userid].encoder = get_base32_encoder(); users[userid].encoder = get_base32_encoder();
users[userid].downenc = 'T'; users[userid].downenc = 'T';
send_version_response(dns_fd, VERSION_ACK, users[userid].seed, userid, q); send_version_response(dns_fd, VERSION_ACK, users[userid].seed, userid, q);
syslog(LOG_INFO, "accepted version for user #%d from %s", #ifdef LINUX
userid, inet_ntoa(tempin->sin_addr)); if (v6_listen) {
char *str = ipv6_str(&q->from.v6.sin6_addr);
syslog(LOG_INFO, "accepted version for user #%d from %s",
userid, str);
free(str);
} else
#endif
syslog(LOG_INFO, "accepted version for user #%d from %s",
userid, inet_ntoa(tempin->sin_addr));
users[userid].q.id = 0; users[userid].q.id = 0;
users[userid].q.id2 = 0; users[userid].q.id2 = 0;
users[userid].q_sendrealsoon.id = 0; users[userid].q_sendrealsoon.id = 0;
@ -815,8 +823,17 @@ handle_null_request(int tun_fd, int dns_fd, struct query *q, int domain_len)
} else { } else {
/* No space for another user */ /* No space for another user */
send_version_response(dns_fd, VERSION_FULL, created_users, 0, q); send_version_response(dns_fd, VERSION_FULL, created_users, 0, q);
syslog(LOG_INFO, "dropped user from %s, server full",
inet_ntoa(((struct sockaddr_in *) &q->from)->sin_addr)); #ifdef LINUX
if (v6_listen) {
char *str = ipv6_str(&q->from.v6.sin6_addr);
syslog(LOG_INFO, "dropped user from %s, server full",
str);
free(str);
} else
#endif
syslog(LOG_INFO, "dropped user from %s, server full",
inet_ntoa(((struct sockaddr_in *) &q->from)->sin_addr));
} }
} else { } else {
#ifdef LINUX #ifdef LINUX