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 2101-2106 Link Here
2101
    clientHttpRequest *http = NULL;
2101
    clientHttpRequest *http = NULL;
2102
#if IPF_TRANSPARENT
2102
#if IPF_TRANSPARENT
2103
    struct natlookup natLookup;
2103
    struct natlookup natLookup;
2104
    natlookup_t *nlp = &natLookup;
2104
    static int natfd = -1;
2105
    static int natfd = -1;
2105
#endif
2106
#endif
2106
2107
Lines 2263-2269 Link Here
2263
		    xstrerror());
2264
		    xstrerror());
2264
		return parseHttpRequestAbort(conn, "error:nat-open-failed");
2265
		return parseHttpRequestAbort(conn, "error:nat-open-failed");
2265
	    }
2266
	    }
2266
	    if (ioctl(natfd, SIOCGNATL, &natLookup) < 0) {
2267
2268
#define NEWSIOCGNATLCMD _IOWR('r', 63, struct natlookup *)
2269
            if ( SIOCGNATL == NEWSIOCGNATLCMD)
2270
                r = ioctl(natfd, SIOCGNATL, &nlp);
2271
            else
2272
                r = ioctl(natfd, SIOCGNATL, &natLookup);
2273
#undef  NEWSIOCGNATLCMD
2274
            if ( r < 0 ) {
2267
		if (errno != ESRCH) {
2275
		if (errno != ESRCH) {
2268
		    debug(50, 1) ("parseHttpRequest: NAT lookup failed: ioctl(SIOCGNATL)\n");
2276
		    debug(50, 1) ("parseHttpRequest: NAT lookup failed: ioctl(SIOCGNATL)\n");
2269
		    close(natfd);
2277
		    close(natfd);

Return to bug 26607