 @@ -1,14 +1,14 @@
-/*	$NetBSD: ipcp.c,v 1.4 2006/06/29 21:50:17 christos Exp $	*/
+/*	$NetBSD: ipcp.c,v 1.5 2010/08/07 20:38:13 christos Exp $	*/
 /*
  * ipcp.c - PPP IP Control Protocol.
+ *
  * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
 @@ -35,29 +35,30 @@
+ *
  * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
  * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
  * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 #define RCSID	"Id: ipcp.c,v 1.73 2008/05/26 08:33:22 paulus Exp"
 #define RCSID	"Id: ipcp.c,v 1.70 2005/08/25 23:59:34 paulus Exp"
 #else
-__RCSID("$NetBSD: ipcp.c,v 1.4 2006/06/29 21:50:17 christos Exp $");
+__RCSID("$NetBSD: ipcp.c,v 1.5 2010/08/07 20:38:13 christos Exp $");
 #endif
 #endif
 /*
  * TODO:
  */
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <netdb.h>
 #include <sys/param.h>
 #include <sys/types.h>
 @@ -73,26 +74,27 @@ __RCSID("$NetBSD: ipcp.c,v 1.4 2006/06/2
 #ifdef RCSID
 static const char rcsid[] = RCSID;
 #endif
 /* global vars */
 ipcp_options ipcp_wantoptions[NUM_PPP];	/* Options that we want to request */
 ipcp_options ipcp_gotoptions[NUM_PPP];	/* Options that peer ack'd */
 ipcp_options ipcp_allowoptions[NUM_PPP]; /* Options we allow peer to request */
 ipcp_options ipcp_hisoptions[NUM_PPP];	/* Options that we ack'd */
 u_int32_t netmask = 0;		/* IP netmask to set on interface */
 bool	disable_defaultip = 0;	/* Don't use hostname for default IP adrs */
 bool	noremoteip = 0;		/* Let him have no IP address */
 /* Hook for a plugin to know when IP protocol has come up */
 void (*ip_up_hook) __P((void)) = NULL;
 /* Hook for a plugin to know when IP protocol has come down */
 void (*ip_down_hook) __P((void)) = NULL;
 /* Hook for a plugin to choose the remote IP address */
 void (*ip_choose_hook) __P((u_int32_t *)) = NULL;
 /* Notifiers for when IPCP goes up and down */
 struct notifier *ip_up_notifier = NULL;
 struct notifier *ip_down_notifier = NULL;
 @@ -219,26 +221,33 @@ static option_t ipcp_option_list[] = {
     { "usepeerdns", o_bool, &usepeerdns,
       "Ask peer for DNS address(es)", 1 },
     { "netmask", o_special, (void *)setnetmask,
       "set netmask", OPT_PRIO | OPT_A2STRVAL | OPT_STATIC, netmask_str },
     { "ipcp-no-addresses", o_bool, &ipcp_wantoptions[0].old_addrs,
       "Disable old-style IP-Addresses usage", OPT_A2CLR,
       &ipcp_allowoptions[0].old_addrs },
     { "ipcp-no-address", o_bool, &ipcp_wantoptions[0].neg_addr,
       "Disable IP-Address usage", OPT_A2CLR,
       &ipcp_allowoptions[0].neg_addr },
 #ifdef __linux__
     { "noremoteip", o_bool, &noremoteip,
       "Allow peer to have no IP address", 1 },
 #endif
     { "nosendip", o_bool, &ipcp_wantoptions[0].neg_addr,
       "Don't send our IP address to peer", OPT_A2CLR,
       &ipcp_wantoptions[0].old_addrs},
     { "IP addresses", o_wild, (void *) &setipaddr,
       "set local and remote IP addresses",
       OPT_NOARG | OPT_A2PRINTER, (void *) &printipaddr },
     { NULL }
 };
 /*
  * Protocol entry points from main code.
  */
 static void ipcp_init __P((int));
 static void ipcp_open __P((int));
 @@ -568,26 +577,34 @@ parse_dotted_ip(p, vp)
 static void
 ipcp_init(unit)
     int unit;
+{
     fsm *f = &ipcp_fsm[unit];
     ipcp_options *wo = &ipcp_wantoptions[unit];
     ipcp_options *ao = &ipcp_allowoptions[unit];
     f->unit = unit;
     f->protocol = PPP_IPCP;
     f->callbacks = &ipcp_callbacks;
     fsm_init(&ipcp_fsm[unit]);
     /*
      * Some 3G modems use repeated IPCP NAKs as a way of stalling
      * until they can contact a server on the network, so we increase
      * the default number of NAKs we accept before we start treating
      * them as rejects.
      */
     f->maxnakloops = 100;
     memset(wo, 0, sizeof(*wo));
     memset(ao, 0, sizeof(*ao));
     wo->neg_addr = wo->old_addrs = 1;
     wo->neg_vj = 1;
     wo->vj_protocol = IPCP_VJ_COMP;
     wo->maxslotindex = MAX_STATES - 1; /* really max index */
     wo->cflag = 1;
     /* max slots and slot-id compression are currently hardwired in */
     /* ppp_if.c to 16 and 1, this needs to be changed (among other */
     /* things) gmc */
 @@ -716,49 +733,52 @@ ipcp_resetci(f)
  * Called by fsm_sconfreq, Send Configure Request.
  */
 static int
 ipcp_cilen(f)
     fsm *f;
+{
     ipcp_options *go = &ipcp_gotoptions[f->unit];
     ipcp_options *wo = &ipcp_wantoptions[f->unit];
     ipcp_options *ho = &ipcp_hisoptions[f->unit];
 #define LENCIADDRS(neg)		(neg ? CILEN_ADDRS : 0)
 #define LENCIVJ(neg, old)	(neg ? (old? CILEN_COMPRESS : CILEN_VJ) : 0)
 #define LENCIADDR(neg)		(neg ? CILEN_ADDR : 0)
-#define LENCIDNS(neg)		(neg ? (CILEN_ADDR) : 0)
+#define LENCIDNS(neg)		LENCIADDR(neg)
 #define LENCIWINS(neg)		LENCIADDR(neg)
     /*
      * First see if we want to change our options to the old
      * forms because we have received old forms from the peer.
      */
     if (go->neg_addr && go->old_addrs && !ho->neg_addr && ho->old_addrs)
 	go->neg_addr = 0;
     if (wo->neg_vj && !go->neg_vj && !go->old_vj) {
 	/* try an older style of VJ negotiation */
 	/* use the old style only if the peer did */
 	if (ho->neg_vj && ho->old_vj) {
 	    go->neg_vj = 1;
 	    go->old_vj = 1;
 	    go->vj_protocol = ho->vj_protocol;
+	}
+    }
     return (LENCIADDRS(!go->neg_addr && go->old_addrs) +
 	    LENCIVJ(go->neg_vj, go->old_vj) +
 	    LENCIADDR(go->neg_addr) +
 	    LENCIDNS(go->req_dns1) +
-	    LENCIDNS(go->req_dns2)) ;
+	    LENCIDNS(go->req_dns2) +
 	    LENCIWINS(go->winsaddr[0]) +
 	    LENCIWINS(go->winsaddr[1])) ;
+}
 /*
  * ipcp_addci - Add our desired CIs to a packet.
  * Called by fsm_sconfreq, Send Configure Request.
  */
 static void
 ipcp_addci(f, ucp, lenp)
     fsm *f;
     u_char *ucp;
     int *lenp;
+{
 @@ -812,38 +832,55 @@ ipcp_addci(f, ucp, lenp)
 #define ADDCIDNS(opt, neg, addr) \
     if (neg) { \
 	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 \
 	    neg = 0; \
+    }
 #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);
     ADDCIVJ(CI_COMPRESSTYPE, go->neg_vj, go->vj_protocol, go->old_vj,
 	    go->maxslotindex, go->cflag);
     ADDCIADDR(CI_ADDR, go->neg_addr, go->ouraddr);
     ADDCIDNS(CI_MS_DNS1, go->req_dns1, go->dnsaddr[0]);
     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;
+}
 /*
  * ipcp_ackci - Ack our CIs.
  * Called by fsm_rconfack, Receive Configure ACK.
+ *
  * Returns:
  *	0 - Ack was bad.
  *	1 - Ack was good.
  */
 static int
 @@ -1118,26 +1155,28 @@ ipcp_nakci(f, p, len, treat_as_reject)
     NAKCIDNS(CI_MS_DNS2, req_dns2,
 	     if (treat_as_reject) {
 		 try.req_dns2 = 0;
 	     } else {
 		 try.dnsaddr[1] = cidnsaddr;
+	     }
 	     );
     /*
      * There may be remaining CIs, if the peer is requesting negotiation
      * on an option that we didn't include in our request packet.
      * If they want to negotiate about IP addresses, we comply.
      * If they want us to ask for compression, we refuse.
      * If they want us to ask for ms-dns, we do that, since some
      * peers get huffy if we don't.
      */
     while (len >= CILEN_VOID) {
 	GETCHAR(citype, p);
 	GETCHAR(cilen, p);
 	if ( cilen < CILEN_VOID || (len -= cilen) < 0 )
 	    goto bad;
 	next = p + cilen - 2;
 	switch (citype) {
 	case CI_COMPRESSTYPE:
 	    if (go->neg_vj || no.neg_vj ||
 		(cilen != CILEN_VJ && cilen != CILEN_COMPRESS))
 		goto bad;
 @@ -1160,26 +1199,51 @@ ipcp_nakci(f, p, len, treat_as_reject)
 	    break;
 	case CI_ADDR:
 	    if (go->neg_addr || no.neg_addr || cilen != CILEN_ADDR)
 		goto bad;
 	    try.old_addrs = 0;
 	    GETLONG(l, p);
 	    ciaddr1 = htonl(l);
 	    if (ciaddr1 && go->accept_local)
 		try.ouraddr = ciaddr1;
 	    if (try.ouraddr != 0)
 		try.neg_addr = 1;
 	    no.neg_addr = 1;
 	    break;
 	case CI_MS_DNS1:
 	    if (go->req_dns1 || no.req_dns1 || cilen != CILEN_ADDR)
 		goto bad;
 	    GETLONG(l, p);
 	    try.dnsaddr[0] = htonl(l);
 	    try.req_dns1 = 1;
 	    no.req_dns1 = 1;
 	    break;
 	case CI_MS_DNS2:
 	    if (go->req_dns2 || no.req_dns2 || cilen != CILEN_ADDR)
 		goto bad;
 	    GETLONG(l, p);
 	    try.dnsaddr[1] = htonl(l);
 	    try.req_dns2 = 1;
 	    no.req_dns2 = 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;
+    }
     /*
      * OK, the Nak is good.  Now we can update state.
      * If there are any remaining options, we ignore them.
      */
     if (f->state != OPENED)
 	*go = try;
     return 1;
 @@ -1276,39 +1340,58 @@ ipcp_rejci(f, p, len)
 	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 != dnsaddr) \
 	    goto bad; \
 	try.neg = 0; \
+    }
 #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,
 	       go->ouraddr, go->hisaddr);
     REJCIVJ(CI_COMPRESSTYPE, neg_vj, go->vj_protocol, go->old_vj,
 	    go->maxslotindex, go->cflag);
     REJCIADDR(CI_ADDR, neg_addr, go->ouraddr);
     REJCIDNS(CI_MS_DNS1, req_dns1, go->dnsaddr[0]);
     REJCIDNS(CI_MS_DNS2, req_dns2, go->dnsaddr[1]);
     REJCIWINS(CI_MS_WINS1, go->winsaddr[0]);
     REJCIWINS(CI_MS_WINS2, go->winsaddr[1]);
     /*
      * If there are any remaining CIs, then this packet is bad.
      */
     if (len != 0)
 	goto bad;
     /*
      * Now we can update state.
      */
     if (f->state != OPENED)
 	*go = try;
     return 1;
 bad:
 @@ -1582,27 +1665,27 @@ endswitch:
 	/* Update output pointer */
 	INCPTR(cilen, ucp);
+    }
     /*
      * If we aren't rejecting this packet, and we want to negotiate
      * their address, and they didn't send their address, then we
      * send a NAK with a CI_ADDR option appended.  We assume the
      * input buffer is long enough that we can append the extra
      * option safely.
      */
     if (rc != CONFREJ && !ho->neg_addr && !ho->old_addrs &&
-	wo->req_addr && !reject_if_disagree) {
+	wo->req_addr && !reject_if_disagree && !noremoteip) {
 	if (rc == CONFACK) {
 	    rc = CONFNAK;
 	    ucp = inp;			/* reset pointer */
 	    wo->req_addr = 0;		/* don't ask again */
+	}
 	PUTCHAR(CI_ADDR, ucp);
 	PUTCHAR(CILEN_ADDR, ucp);
 	tl = ntohl(wo->hisaddr);
 	PUTLONG(tl, ucp);
+    }
     *len = ucp - inp;			/* Compute output length */
     IPCPDEBUG(("ipcp: returning Configure-%s", CODENAME(rc)));
 @@ -1642,53 +1725,54 @@ ip_check_options()
+}
 /*
  * ip_demand_conf - configure the interface as though
  * IPCP were up, for use with dial-on-demand.
  */
 static int
 ip_demand_conf(u)
     int u;
+{
     ipcp_options *wo = &ipcp_wantoptions[u];
-    if (wo->hisaddr == 0) {
+    if (wo->hisaddr == 0 && !noremoteip) {
 	/* make up an arbitrary address for the peer */
 	wo->hisaddr = htonl(0x0a707070 + ifunit);
 	wo->accept_remote = 1;
+    }
     if (wo->ouraddr == 0) {
 	/* make up an arbitrary address for us */
 	wo->ouraddr = htonl(0x0a404040 + ifunit);
 	wo->accept_local = 1;
 	ask_for_local = 0;	/* don't tell the peer this address */
+    }
     if (!sifaddr(u, wo->ouraddr, wo->hisaddr, GetMask(wo->ouraddr)))
 	return 0;
     ipcp_script(_PATH_IPPREUP, 1);
     if (!sifup(u))
 	return 0;
     if (!sifnpmode(u, PPP_IP, NPMODE_QUEUE))
 	return 0;
     if (wo->default_route)
 	if (sifdefaultroute(u, wo->ouraddr, wo->hisaddr))
 	    default_route_set[u] = 1;
     if (wo->proxy_arp)
 	if (sifproxyarp(u, wo->hisaddr))
 	    proxy_arp_set[u] = 1;
     notice("local  IP address %I", wo->ouraddr);
-    notice("remote IP address %I", wo->hisaddr);
+    if (wo->hisaddr)
 	notice("remote IP address %I", wo->hisaddr);
     return 1;
+}
 /*
  * ipcp_up - IPCP has come UP.
+ *
  * Configure the IP network interface appropriately and bring it up.
  */
 static void
 ipcp_up(f)
     fsm *f;
 @@ -1707,87 +1791,92 @@ ipcp_up(f)
 	ho->hisaddr = wo->hisaddr;
     if (!(go->neg_addr || go->old_addrs) && (wo->neg_addr || wo->old_addrs)
 	&& wo->ouraddr != 0) {
 	error("Peer refused to agree to our IP address");
 	ipcp_close(f->unit, "Refused our IP address");
 	return;
+    }
     if (go->ouraddr == 0) {
 	error("Could not determine local IP address");
 	ipcp_close(f->unit, "Could not determine local IP address");
 	return;
+    }
-    if (ho->hisaddr == 0) {
+    if (ho->hisaddr == 0 && !noremoteip) {
 	ho->hisaddr = htonl(0x0a404040 + ifunit);
 	warn("Could not determine remote IP address: defaulting to %I",
 	     ho->hisaddr);
+    }
     script_setenv("IPLOCAL", ip_ntoa(go->ouraddr), 0);
-    script_setenv("IPREMOTE", ip_ntoa(ho->hisaddr), 1);
+    if (ho->hisaddr != 0)
 	script_setenv("IPREMOTE", ip_ntoa(ho->hisaddr), 1);
     if (!go->req_dns1)
 	go->dnsaddr[0] = 0;
     if (!go->req_dns2)
 	go->dnsaddr[1] = 0;
     if (go->dnsaddr[0])
 	script_setenv("DNS1", ip_ntoa(go->dnsaddr[0]), 0);
     if (go->dnsaddr[1])
 	script_setenv("DNS2", ip_ntoa(go->dnsaddr[1]), 0);
     if (usepeerdns && (go->dnsaddr[0] || go->dnsaddr[1])) {
 	script_setenv("USEPEERDNS", "1", 0);
 	create_resolv(go->dnsaddr[0], go->dnsaddr[1]);
+    }
     /*
      * Check that the peer is allowed to use the IP address it wants.
      */
-    if (!auth_ip_addr(f->unit, ho->hisaddr)) {
+    if (ho->hisaddr != 0 && !auth_ip_addr(f->unit, ho->hisaddr)) {
 	error("Peer is not authorized to use remote address %I", ho->hisaddr);
 	ipcp_close(f->unit, "Unauthorized remote IP address");
 	return;
+    }
     /* set tcp compression */
     sifvjcomp(f->unit, ho->neg_vj, ho->cflag, ho->maxslotindex);
     /*
      * If we are doing dial-on-demand, the interface is already
      * configured, so we put out any saved-up packets, then set the
      * interface to pass IP packets.
      */
     if (demand) {
 	if (go->ouraddr != wo->ouraddr || ho->hisaddr != wo->hisaddr) {
 	    ipcp_clear_addrs(f->unit, wo->ouraddr, wo->hisaddr);
 	    if (go->ouraddr != wo->ouraddr) {
 		warn("Local IP address changed to %I", go->ouraddr);
 		script_setenv("OLDIPLOCAL", ip_ntoa(wo->ouraddr), 0);
 		wo->ouraddr = go->ouraddr;
 	    } else
 		script_unsetenv("OLDIPLOCAL");
-	    if (ho->hisaddr != wo->hisaddr) {
+	    if (ho->hisaddr != wo->hisaddr && wo->hisaddr != 0) {
 		warn("Remote IP address changed to %I", ho->hisaddr);
 		script_setenv("OLDIPREMOTE", ip_ntoa(wo->hisaddr), 0);
 		wo->hisaddr = ho->hisaddr;
 	    } else
 		script_unsetenv("OLDIPREMOTE");
 	    /* Set the interface to the new addresses */
 	    mask = GetMask(go->ouraddr);
 	    if (!sifaddr(f->unit, go->ouraddr, ho->hisaddr, mask)) {
 		if (debug)
 		    warn("Interface configuration failed");
 		ipcp_close(f->unit, "Interface configuration failed");
 		return;
+	    }
 	    /* assign a default route through the interface if required */
-	    if (ipcp_wantoptions[f->unit].default_route)
+	    if (ho->hisaddr != 0 && ipcp_wantoptions[f->unit].default_route)
 		if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr))
 		    default_route_set[f->unit] = 1;
 	    /* Make a proxy ARP entry if requested. */
 	    if (ipcp_wantoptions[f->unit].proxy_arp)
 		if (sifproxyarp(f->unit, ho->hisaddr))
 		    proxy_arp_set[f->unit] = 1;
+	}
 	demand_rexmit(PPP_IP);
 	sifnpmode(f->unit, PPP_IP, NPMODE_PASS);
     } else {
 @@ -1822,34 +1911,35 @@ ipcp_up(f)
 		warn("Interface configuration failed");
 	    ipcp_close(f->unit, "Interface configuration failed");
 	    return;
+	}
 #endif
 	sifnpmode(f->unit, PPP_IP, NPMODE_PASS);
 	/* assign a default route through the interface if required */
 	if (ipcp_wantoptions[f->unit].default_route)
 	    if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr))
 		default_route_set[f->unit] = 1;
 	/* Make a proxy ARP entry if requested. */
-	if (ipcp_wantoptions[f->unit].proxy_arp)
+	if (ho->hisaddr != 0 && ipcp_wantoptions[f->unit].proxy_arp)
 	    if (sifproxyarp(f->unit, ho->hisaddr))
 		proxy_arp_set[f->unit] = 1;
 	ipcp_wantoptions[0].ouraddr = go->ouraddr;
 	notice("local  IP address %I", go->ouraddr);
-	notice("remote IP address %I", ho->hisaddr);
+	if (ho->hisaddr != 0)
 	    notice("remote IP address %I", ho->hisaddr);
 	if (go->dnsaddr[0])
 	    notice("primary   DNS address %I", go->dnsaddr[0]);
 	if (go->dnsaddr[1])
 	    notice("secondary DNS address %I", go->dnsaddr[1]);
+    }
     reset_link_stats(f->unit);
     np_up(f->unit, PPP_IP);
     ipcp_is_up = 1;
     notify(ip_up_notifier, 0);
     if (ip_up_hook)
 @@ -2115,27 +2205,27 @@ ipcp_printpkt(p, plen, printer, arg)
+		}
 		break;
 	    case CI_ADDR:
 		if (olen == CILEN_ADDR) {
 		    p += 2;
 		    GETLONG(cilong, p);
 		    printer(arg, "addr %I", htonl(cilong));
+		}
 		break;
 	    case CI_MS_DNS1:
 	    case CI_MS_DNS2:
 	        p += 2;
 		GETLONG(cilong, p);
-		printer(arg, "ms-dns%d %I", code - CI_MS_DNS1 + 1,
+		printer(arg, "ms-dns%d %I", (code == CI_MS_DNS1? 1: 2),
 			htonl(cilong));
 		break;
 	    case CI_MS_WINS1:
 	    case CI_MS_WINS2:
 	        p += 2;
 		GETLONG(cilong, p);
 		printer(arg, "ms-wins %I", htonl(cilong));
 		break;
+	    }
 	    while (p < optend) {
 		GETCHAR(code, p);
 		printer(arg, " %.2x", code);
+	    }