$ git clone https://socialnetwork.ion.nu/socialnetwork-web.git
commit 34c1768d33c812770478efcf5b07946d1fc2a1d2
Author: Alicia <...>
Date: Wed Jun 28 18:36:18 2017 +0200
Use struct sockaddr_storage instead of struct sockaddr.
diff --git a/Makefile b/Makefile
index 1c1b200..04aeb62 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ EMSCRIPTVERSION=1.37.12
GMPVERSION=6.1.2
NETTLEVERSION=3.3
GNUTLSVERSION=3.5.12
-SOCIALNETWORKREVISION=9e11beb56de1c867b1339fef577c97c2ac619d59
+SOCIALNETWORKREVISION=c76b97a476bf6899bd775e298f9ed5fad650304e
REVISION=$(shell git log | sed -n -e 's/^commit //p;q')
JSLIBS=$(shell PKG_CONFIG_PATH=toolchain/usr/lib/pkgconfig pkg-config --libs gnutls nettle hogweed) -lgmp
JSCFLAGS=$(shell PKG_CONFIG_PATH=toolchain/usr/lib/pkgconfig pkg-config --cflags gnutls)
diff --git a/jsglue.c b/jsglue.c
index 5dcee29..deb8f25 100644
--- a/jsglue.c
+++ b/jsglue.c
@@ -22,7 +22,7 @@
#include <libsocial/udpstream_private.h>
#include <libsocial/udpstream.h>
#include "jsglue.h"
-extern struct udpstream* stream_new(int sock, struct sockaddr* addr, socklen_t addrlen);
+extern struct udpstream* stream_new(int sock, struct sockaddr_storage* addr, socklen_t addrlen);
struct file
{
@@ -115,12 +115,12 @@ void jsglue_addfile(const char* path, const void* data, size_t size)
f->size=size;
}
-void(*websockproxy_write)(struct sockaddr*, socklen_t, const void*, size_t);
-void websockproxy_setwrite(void(*writefunc)(struct sockaddr*, socklen_t, const void*, size_t))
+void(*websockproxy_write)(struct sockaddr_storage*, socklen_t, const void*, size_t);
+void websockproxy_setwrite(void(*writefunc)(struct sockaddr_storage*, socklen_t, const void*, size_t))
{
websockproxy_write=writefunc;
}
-void websockproxy_read(struct sockaddr* addr, socklen_t addrlen, const void* buf, size_t payloadsize)
+void websockproxy_read(struct sockaddr_storage* addr, socklen_t addrlen, const void* buf, size_t payloadsize)
{
// Find the stream
struct udpstream* stream=udpstream_find(addr, addrlen);
diff --git a/jsglue.h b/jsglue.h
index bfb578c..bde4eae 100644
--- a/jsglue.h
+++ b/jsglue.h
@@ -31,4 +31,4 @@ extern ssize_t jsglue_write(int fd, const void* buf, size_t size);
extern int jsglue_open(const char* path, int flags, mode_t mode);
extern int jsglue_stat(const char* path, struct stat* st);
extern void jsglue_close(int fd);
-extern void(*websockproxy_write)(struct sockaddr*, socklen_t, const void*, size_t);
+extern void(*websockproxy_write)(struct sockaddr_storage*, socklen_t, const void*, size_t);