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

---

Browse source
This commit is contained in:
Julian Kranz 2012-01-28 14:57:57 +01:00 • committed by Barak A. Pearlmutter
parent 854465e62a
commit 8254d3f4b5
1 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/iodined.c
View file

@ -125,7 +125,7 @@ sigint(int sig)
#define LOG_INFO 6 #define LOG_INFO 6
#define LOG_DEBUG 7 #define LOG_DEBUG 7
static void static void
syslog(int a, const char *str, ...) syslog(int a, const char *str, ...)10.42.22.2
{ {
/* TODO: implement (add to event log), move to common.c */ /* TODO: implement (add to event log), move to common.c */
; ;
@ -161,7 +161,7 @@ check_user_and_ip(int userid, struct query *q)
} else { } else {
#endif #endif
tempin = (struct sockaddr_in *) &(q->from); tempin = (struct sockaddr_in *) &(q->from);
return memcmp(&(users[userid].host), &(tempin->sin_addr), return memcmp(&(users[userid].host.v4), &(tempin->sin_addr),
sizeof(struct in_addr)); sizeof(struct in_addr));
#ifdef LINUX #ifdef LINUX
} }
@ -756,9 +756,18 @@ handle_null_request(int tun_fd, int dns_fd, struct query *q, int domain_len)
struct sockaddr_in *tempin; struct sockaddr_in *tempin;
users[userid].seed = rand(); users[userid].seed = rand();
/* Store remote IP number */ /* Store remote IP number */
tempin = (struct sockaddr_in *) &(q->from); #ifdef LINUX
memcpy(&(users[userid].host), &(tempin->sin_addr), sizeof(struct in_addr)); if(v6_listen)
memcpy(&(users[userid].host.v6), &q->from.v6, sizeof(struct in6_addr));
else {
#endif
tempin = (struct sockaddr_in *) &(q->from);
memcpy(&(users[userid].host.v4), &(tempin->sin_addr), sizeof(struct in_addr));
#ifdef LINUX
}
#endif
memcpy(&(users[userid].q), q, sizeof(struct query)); memcpy(&(users[userid].q), q, sizeof(struct query));
users[userid].encoder = get_base32_encoder(); users[userid].encoder = get_base32_encoder();
@ -1964,8 +1973,18 @@ handle_raw_login(char *packet, int len, struct query *q, int fd, int userid)
memcpy(&(users[userid].q), q, sizeof(struct query)); memcpy(&(users[userid].q), q, sizeof(struct query));
/* Store remote IP number */ /* Store remote IP number */
tempin = (struct sockaddr_in *) &(q->from); #ifdef LINUX
memcpy(&(users[userid].host), &(tempin->sin_addr), sizeof(struct in_addr)); if (v6_listen)
memcpy(&(users[userid].host.v6), &q->from.v6,
sizeof(struct in6_addr));
else {
#endif
tempin = (struct sockaddr_in *) &(q->from);
memcpy(&(users[userid].host.v4), &(tempin->sin_addr),
sizeof(struct in_addr));
#ifdef LINUX
}
#endif
/* Correct hash, reply with hash of seed - 1 */ /* Correct hash, reply with hash of seed - 1 */
user_set_conn_type(userid, CONN_RAW_UDP); user_set_conn_type(userid, CONN_RAW_UDP);