diff options
author | cvs2svn <cvs2svn@FreeBSD.org> | 2007-01-29 10:14:29 +0000 |
---|---|---|
committer | cvs2svn <cvs2svn@FreeBSD.org> | 2007-01-29 10:14:29 +0000 |
commit | cec49cf8f48420d4e91f2d480cf281bd2d79e999 (patch) | |
tree | 26a0b2f13d3c39b0da0fdcdd6f2fdbf06bdc636e /net/vde2/files/patch-port.c | |
parent | - Update to 0.4.9.3.20070117 (diff) |
This commit was manufactured by cvs2svn to create tag 'RELEASE_4_EOL'.4-eol
Notes
Notes:
svn path=/head/; revision=183609
svn path=/tags/RELEASE_4_EOL/; revision=183610; tag=4-eol
Diffstat (limited to 'net/vde2/files/patch-port.c')
-rw-r--r-- | net/vde2/files/patch-port.c | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/net/vde2/files/patch-port.c b/net/vde2/files/patch-port.c deleted file mode 100644 index 02d2359c0e15..000000000000 --- a/net/vde2/files/patch-port.c +++ /dev/null @@ -1,34 +0,0 @@ ---- port.c Sat Jan 29 15:02:08 2005 -+++ port.c Sun Jan 30 11:36:03 2005 -@@ -10,6 +10,9 @@ - #include <syslog.h> - #include <sys/socket.h> - #include <sys/un.h> -+#ifdef __FreeBSD__ -+#include <string.h> -+#endif - #include "switch.h" - #include "hash.h" - #include "port.h" -@@ -316,10 +319,19 @@ - port=p->data; - //if(match_sock(p->control, fd, p->data, p->data_len, &data)) break; - if(p->data_len == sizeof(struct sock_data) && -- !(memcmp(&(port->sock), &mine->sock, sizeof(mine->sock)))) break; -+#ifdef __FreeBSD__ -+ port->sock.sun_family == mine->sock.sun_family && -+ !(strcmp(port->sock.sun_path, mine->sock.sun_path))) -+#else -+ !(memcmp(&(port->sock), &mine->sock, sizeof(mine->sock)))) -+#endif -+ break; - } - } -- handle_direct_data(p,hub,&packet,len); -+ if (i < g_nfds) -+ handle_direct_data(p,hub,&packet,len); -+ else -+ printlog(LOG_WARNING, "No port associated with descriptor %d", fd); - return 0; - } - |