GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-10-13 18:12:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups in IPv6 handling.

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2014-01-29 14:31:18 +01:00
parent 885f394f95
commit b5b2d5b20a
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ip-lease.c
+5 -5
View File
@@ -289,10 +289,10 @@ int get_ipv6_lease(main_server_st* s, struct proc_st* proc)
memcpy(&tmp, &network, sizeof(tmp)); memcpy(&tmp, &network, sizeof(tmp));
((struct sockaddr_in6*)&tmp)->sin6_family = AF_INET6; ((struct sockaddr_in6*)&tmp)->sin6_family = AF_INET6;
((struct sockaddr_in6*)&tmp)->sin6_port = AF_INET6; ((struct sockaddr_in6*)&tmp)->sin6_port = 0;
((struct sockaddr_in6*)&rnd)->sin6_family = AF_INET6; ((struct sockaddr_in6*)&rnd)->sin6_family = AF_INET6;
((struct sockaddr_in6*)&rnd)->sin6_port = AF_INET6; ((struct sockaddr_in6*)&rnd)->sin6_port = 0;
do { do {
if (max_loops == 0) { if (max_loops == 0) {
@@ -335,7 +335,8 @@ int get_ipv6_lease(main_server_st* s, struct proc_st* proc)
memcpy(&proc->ipv6->lip, &rnd, proc->ipv6->lip_len); memcpy(&proc->ipv6->lip, &rnd, proc->ipv6->lip_len);
/* RIP = LIP + 1 */ /* RIP = LIP + 1 */
memcpy(&tmp, &proc->ipv6->lip, proc->ipv6->rip_len); memcpy(&tmp, &proc->ipv6->lip, sizeof(tmp));
proc->ipv6->rip_len = proc->ipv6->lip_len;
bignum_add(SA_IN6_U8_P(&tmp), sizeof(struct in6_addr), 1); bignum_add(SA_IN6_U8_P(&tmp), sizeof(struct in6_addr), 1);
@@ -347,7 +348,6 @@ int get_ipv6_lease(main_server_st* s, struct proc_st* proc)
continue; continue;
} }
proc->ipv6->rip_len = sizeof(struct sockaddr_in6);
memcpy(&proc->ipv6->rip, &tmp, proc->ipv6->rip_len); memcpy(&proc->ipv6->rip, &tmp, proc->ipv6->rip_len);
/* mask the last IP with the netmask */ /* mask the last IP with the netmask */
@@ -419,7 +419,7 @@ char buf[128];
if (proc->ipv6) if (proc->ipv6)
mslog(s, proc, LOG_INFO, "assigned IPv6 to '%s': %s", proc->username, mslog(s, proc, LOG_INFO, "assigned IPv6 to '%s': %s", proc->username,
human_addr((void*)&proc->ipv6->rip, proc->ipv6->rip_len, buf, sizeof(buf))); human_addr((void*)&proc->ipv6->rip, proc->ipv6->rip_len, buf, sizeof(buf)));
return 0; return 0;
} }
src/tun.c
+9 -5
View File
@@ -49,7 +49,7 @@
static int set_network_info( main_server_st* s, struct proc_st* proc) static int set_network_info( main_server_st* s, struct proc_st* proc)
{ {
struct ifreq ifr; struct ifreq ifr;
int fd, ret; int fd, ret, e;
fd = socket(AF_INET, SOCK_STREAM, 0); fd = socket(AF_INET, SOCK_STREAM, 0);
if (fd == -1) if (fd == -1)
@@ -64,7 +64,8 @@ static int set_network_info( main_server_st* s, struct proc_st* proc)
ret = ioctl(fd, SIOCSIFADDR, &ifr); ret = ioctl(fd, SIOCSIFADDR, &ifr);
if (ret != 0) { if (ret != 0) {
mslog(s, NULL, LOG_ERR, "%s: Error setting IPv4.\n", proc->tun_lease.name); e = errno;
mslog(s, NULL, LOG_ERR, "%s: Error setting IPv4: %s\n", proc->tun_lease.name, strerror(e));
} }
memset(&ifr, 0, sizeof(ifr)); memset(&ifr, 0, sizeof(ifr));
@@ -74,7 +75,8 @@ static int set_network_info( main_server_st* s, struct proc_st* proc)
ret = ioctl(fd, SIOCSIFDSTADDR, &ifr); ret = ioctl(fd, SIOCSIFDSTADDR, &ifr);
if (ret != 0) { if (ret != 0) {
mslog(s, NULL, LOG_ERR, "%s: Error setting DST IPv4.\n", proc->tun_lease.name); e = errno;
mslog(s, NULL, LOG_ERR, "%s: Error setting DST IPv4: %s\n", proc->tun_lease.name, strerror(e));
} }
} }
@@ -87,7 +89,8 @@ static int set_network_info( main_server_st* s, struct proc_st* proc)
ret = ioctl(fd, SIOCSIFADDR, &ifr); ret = ioctl(fd, SIOCSIFADDR, &ifr);
if (ret != 0) { if (ret != 0) {
mslog(s, NULL, LOG_ERR, "%s: Error setting IPv6.\n", proc->tun_lease.name); e = errno;
mslog(s, NULL, LOG_ERR, "%s: Error setting IPv6: %s\n", proc->tun_lease.name, strerror(e));
} }
memset(&ifr, 0, sizeof(ifr)); memset(&ifr, 0, sizeof(ifr));
@@ -97,7 +100,8 @@ static int set_network_info( main_server_st* s, struct proc_st* proc)
ret = ioctl(fd, SIOCSIFDSTADDR, &ifr); ret = ioctl(fd, SIOCSIFDSTADDR, &ifr);
if (ret != 0) { if (ret != 0) {
mslog(s, NULL, LOG_ERR, "%s: Error setting DST IPv6.\n", proc->tun_lease.name); e = errno;
mslog(s, NULL, LOG_ERR, "%s: Error setting DST IPv6: %s\n", proc->tun_lease.name, strerror(e));
} }
} }