compiles, technically

This commit is contained in:
Joseph Henry 2015-09-10 20:22:35 -04:00
parent 20beafedc5
commit e4dc46741f
4 changed files with 56 additions and 26 deletions

View file

@ -9,6 +9,7 @@
namespace ZeroTier
{
/*
ip_addr_t convert_ip(struct sockaddr_in * addr)
{
ip_addr_t conn_addr;
@ -20,7 +21,7 @@ namespace ZeroTier
IP4_ADDR(&conn_addr, a,b,c,d);
return conn_addr;
}
*/
ip_addr_t ip_addr_sin(register struct sockaddr_in *sin) {
ip_addr_t ip;
*((struct sockaddr_in*) &ip) = *sin;
@ -29,9 +30,6 @@ namespace ZeroTier
// Functions used to pass file descriptors between processes
ssize_t sock_fd_write(int sock, int fd);
ssize_t sock_fd_read(int sock, void *buf, ssize_t bufsize, int *fd);
ssize_t sock_fd_write(int sock, int fd)
{
ssize_t size;