Hi,
Halton Huo wrote:
> Fix for vino ipv6 supporting, bugster #6483870, bugzilla #310965.
> Index: patches/vino-08-ipv6-create-ipv6-socket.diff
> ===================================================================
> --- patches/vino-08-ipv6-create-ipv6-socket.diff (revision 9675)
> +++ patches/vino-08-ipv6-create-ipv6-socket.diff (working copy)
> @@ -1,6 +1,14 @@
> ---- vino-2.16.0.old/server/libvncserver/rfb/rfb.h 2006-10-27
> 21:58:29.389494000 +0800
> -+++ vino-2.16.0/server/libvncserver/rfb/rfb.h 2006-10-27
> 22:06:29.961673000 +0800
> -@@ -392,7 +392,7 @@
> +--- vino-2.16.0.old/server/libvncserver/rfb/rfb.h 2006-11-07
> 21:53:23.035257000 +0800
> ++++ vino-2.16.0/server/libvncserver/rfb/rfb.h 2006-11-07
> 21:55:06.163532000 +0800
> +@@ -112,6 +112,7 @@
> + char rfbThisHost[255];
> +
> + rfbBool autoPort;
> ++ rfbBool localOnly;
> + int rfbPort;
> + SOCKET rfbListenSock;
> + int maxSock;
> +@@ -392,7 +393,7 @@
> extern int WriteExact(rfbClientPtr cl, const char *buf, int len);
> extern void rfbProcessNewConnection(rfbScreenInfoPtr rfbScreen);
> extern void rfbCheckFds(rfbScreenInfoPtr rfbScreen,long usec);
> @@ -9,8 +17,8 @@
>
> /* rfbserver.c */
>
> ---- vino-2.16.0.old/server/libvncserver/sockets.c 2006-10-27
> 21:58:29.388760000 +0800
> -+++ vino-2.16.0/server/libvncserver/sockets.c 2006-10-27
> 22:07:48.232925000 +0800
> +--- vino-2.16.0.old/server/libvncserver/sockets.c 2006-11-07
> 21:53:23.036271000 +0800
> ++++ vino-2.16.0/server/libvncserver/sockets.c 2006-11-07
> 21:54:03.941308000 +0800
> @@ -132,7 +132,7 @@
> rfbLog("Autoprobing TCP port \n");
You're including spurious diff in the patch that doesn't need to be there. I'd
suggest removing it.
Glynn
