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:53:42 +01:00 • committed by Barak A. Pearlmutter
parent 61d1439899
commit 796f7f2d8d
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common.c
View file

@ -457,7 +457,7 @@ char *ipv6_str(struct in6_addr *ip) {
size_t position = 0; size_t position = 0;
for (i = 0; i < 8; ++i) for (i = 0; i < 8; ++i)
position += sprintf(str + position, "%04x%s", ntohs(ip->__in6_u.__u6_addr16[i]), i < 7 ? ":" position += sprintf(str + position, "%04x%s", ntohs(ip->__in6_u.__u6_addr16[i]), i < 7 ? ":"
: "/"); : "");
str[size - 1] = 0; str[size - 1] = 0;
return str; return str;
} }

7
src/iodined.c
View file

@ -1728,8 +1728,6 @@ tunnel_dns(int tun_fd, int dns_fd, int bind_fd)
if ((read = read_dns(dns_fd, tun_fd, &q)) <= 0) if ((read = read_dns(dns_fd, tun_fd, &q)) <= 0)
return 0; return 0;
printf("DEBUG - 0\n");
if (debug >= 2) { if (debug >= 2) {
struct sockaddr_in *tempin; struct sockaddr_in *tempin;
tempin = (struct sockaddr_in *) &(q.from); tempin = (struct sockaddr_in *) &(q.from);
@ -2114,7 +2112,7 @@ read_dns(int fd, int tun_fd, struct query *q) /* FIXME: tun_fd is because of raw
r = recvmsg(fd, &msg, 0); r = recvmsg(fd, &msg, 0);
printf("[DEBUG] read_dns() - Received message...\n"); // printf("[DEBUG] read_dns() - Received message...\n");
#else #else
addrlen = sizeof(struct sockaddr); addrlen = sizeof(struct sockaddr);
@ -2135,9 +2133,6 @@ read_dns(int fd, int tun_fd, struct query *q) /* FIXME: tun_fd is because of raw
#ifdef LINUX #ifdef LINUX
} }
#endif #endif
ipv6_print(&(from6.sin6_addr), 42);
/* TODO do not handle raw packets here! */ /* TODO do not handle raw packets here! */
if (raw_decode(packet, r, q, fd, tun_fd)) { if (raw_decode(packet, r, q, fd, tun_fd)) {
return 0; return 0;