Changeset 12373

Timestamp:

06/25/2009 11:26:47 AM (9 months ago)

Author:

BrainSlayer

Message:

wins patch for stupid 3g isp's

Files:

• src/router/pppd.new/pppd/ipcp.c (modified) (7 diffs)

src/router/pppd.new/pppd/ipcp.c

@@ -722 +722 @@
-#define LENCIVJ(neg, old)       (neg ? (old? CILEN_COMPRESS : CILEN_VJ) : 0)
-#define LENCIADDR(neg)          (neg ? CILEN_ADDR : 0)
-
+
+
-
-    /*
@@ -744 +745 @@
-            LENCIADDR(go->neg_addr) +
-            LENCIDNS(go->req_dns1) +
-
+
+
+
-}
-
@@ -818 +821 @@
-    }
-
+#define ADDCIWINS(opt, addr)                  \
+    if (addr) { \
+        if (len >= CILEN_ADDR) { \
+            u_int32_t l; \
+            PUTCHAR(opt, ucp); \
+            PUTCHAR(CILEN_ADDR, ucp); \
+            l = ntohl(addr); \
+            PUTLONG(l, ucp); \
+            len -= CILEN_ADDR; \
+        } else \
+            addr = 0; \
+    }
+
-    ADDCIADDRS(CI_ADDRS, !go->neg_addr && go->old_addrs, go->ouraddr,
-               go->hisaddr);
@@ -830 +846 @@
-    ADDCIDNS(CI_MS_DNS2, go->req_dns2, go->dnsaddr[1]);
-
+    ADDCIWINS(CI_MS_WINS1, go->winsaddr[0]);
+
+    ADDCIWINS(CI_MS_WINS2, go->winsaddr[1]);
+    
-    *lenp -= len;
-}
@@ -1166 +1186 @@
-            no.neg_addr = 1;
-            break;
+        case CI_MS_WINS1:
+        case CI_MS_WINS2:
+            if (cilen != CILEN_ADDR)
+                goto bad;
+            GETLONG(l, p);
+            ciaddr1 = htonl(l);
+            if (ciaddr1)
+                try.winsaddr[citype == CI_MS_WINS2] = ciaddr1;
+            break;
-        }
-        p = next;
@@ -1282 +1311 @@
-    }
-
+#define REJCIWINS(opt, addr) \
+    if (addr && \
+        ((cilen = p[1]) == CILEN_ADDR) && \
+        len >= cilen && \
+        p[0] == opt) { \
+        u_int32_t l; \
+        len -= cilen; \
+        INCPTR(2, p); \
+        GETLONG(l, p); \
+        cilong = htonl(l); \
+        /* Check rejected value. */ \
+        if (cilong != addr) \
+            goto bad; \
+        try.winsaddr[opt == CI_MS_WINS2] = 0; \
+    }
-
-    REJCIADDRS(CI_ADDRS, !go->neg_addr && go->old_addrs,
@@ -1294 +1338 @@
-
-    REJCIDNS(CI_MS_DNS2, req_dns2, go->dnsaddr[1]);
+
+    REJCIWINS(CI_MS_WINS1, go->winsaddr[0]);
+
+    REJCIWINS(CI_MS_WINS2, go->winsaddr[1]);
-
-    /*