View | Details | Raw Unified | Return to bug 26607 | Differences between
and this patch

Collapse All | Expand All

(-)src/client_side.c (-1 / +9 lines)
Lines 1938-1943 Link Here
1938
    clientHttpRequest *http = NULL;
1938
    clientHttpRequest *http = NULL;
1939
#if IPF_TRANSPARENT
1939
#if IPF_TRANSPARENT
1940
    struct natlookup natLookup;
1940
    struct natlookup natLookup;
1941
    natlookup_t *nlp = &natLookup;
1941
    static int natfd = -1;
1942
    static int natfd = -1;
1942
#endif
1943
#endif
1943
1944
Lines 2089-2095 Link Here
2089
		    xstrerror());
2090
		    xstrerror());
2090
		return parseHttpRequestAbort(conn, "error:nat-open-failed");
2091
		return parseHttpRequestAbort(conn, "error:nat-open-failed");
2091
	    }
2092
	    }
2092
	    if (ioctl(natfd, SIOCGNATL, &natLookup) < 0) {
2093
	    
2094
#define NEWSIOCGNATLCMD _IOWR('r', 63, struct natlookup *)
2095
            if ( SIOCGNATL == NEWSIOCGNATLCMD)
2096
                r = ioctl(natfd, SIOCGNATL, &nlp);
2097
            else
2098
                r = ioctl(natfd, SIOCGNATL, &natLookup);
2099
#undef  NEWSIOCGNATLCMD
2100
            if ( r < 0 ) {
2093
		if (errno != ESRCH) {
2101
		if (errno != ESRCH) {
2094
		    debug(50, 1) ("parseHttpRequest: NAT lookup failed: ioctl(SIOCGNATL)\n");
2102
		    debug(50, 1) ("parseHttpRequest: NAT lookup failed: ioctl(SIOCGNATL)\n");
2095
		    close(natfd);
2103
		    close(natfd);

Return to bug 26607