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

Collapse All | Expand All

(-)b/usr.sbin/ndp/ndp.c (-4 / +3 lines)
Lines 598-604 dump(struct sockaddr_in6 *addr, int cflag) Link Here
598
	if (!tflag && !cflag) {
598
	if (!tflag && !cflag) {
599
		char xobuf[200];
599
		char xobuf[200];
600
		snprintf(xobuf, sizeof(xobuf),
600
		snprintf(xobuf, sizeof(xobuf),
601
		    "{T:/%%-%d.%ds} {T:/%%-%d.%ds} {T:/%%%d.%ds} {T:/%%-9.9s} {T:%%1s} {T:%%5s}\n",
601
		    "{T:/%%-%d.%ds} {T:/%%-%d.%ds} {T:/%%%d.%ds} {T:/%%-9.9s} {T:/%%1s} {T:/%%5s}\n",
602
		    W_ADDR, W_ADDR, W_LL, W_LL, W_IF, W_IF);
602
		    W_ADDR, W_ADDR, W_LL, W_LL, W_IF, W_IF);
603
		xo_emit(xobuf, "Neighbor", "Linklayer Address", "Netif", "Expire", "S", "Flags");
603
		xo_emit(xobuf, "Neighbor", "Linklayer Address", "Netif", "Expire", "S", "Flags");
604
	}
604
	}
Lines 1266-1272 plist() Link Here
1266
		if (p->expire == 0)
1266
		if (p->expire == 0)
1267
			xo_emit(", expire=Never{en:permanent/true}");
1267
			xo_emit(", expire=Never{en:permanent/true}");
1268
		else if (p->expire >= now.tv_sec)
1268
		else if (p->expire >= now.tv_sec)
1269
			xo_emit(", expire=%s{e:expires_sec/%d}",
1269
			xo_emit("{d:/, expire=%s}{e:expires_sec/%d}",
1270
			    sec2str(expire_in), expire_in);
1270
			    sec2str(expire_in), expire_in);
1271
		else
1271
		else
1272
			xo_emit(", expired{e:expires_sec/%d}", expire_in);
1272
			xo_emit(", expired{e:expires_sec/%d}", expire_in);
Lines 1481-1488 ts_print(const struct timeval *tvp) Link Here
1481
1481
1482
	/* Default */
1482
	/* Default */
1483
	sec = (tvp->tv_sec + thiszone) % 86400;
1483
	sec = (tvp->tv_sec + thiszone) % 86400;
1484
	xo_emit("{:tv_sec/%lld}{:tv_usec/%lld}%02d:%02d:%02d.%06u ",
1484
	xo_emit("{:ts_hours/%02d}:{:ts_minutes/%02d}:{:ts_seconds/%02d}.{:ts_usec/%06d} ",
1485
	    tvp->tv_sec, tvp->tv_usec,
1486
	    sec / 3600, (sec % 3600) / 60, sec % 60, (u_int32_t)tvp->tv_usec);
1485
	    sec / 3600, (sec % 3600) / 60, sec % 60, (u_int32_t)tvp->tv_usec);
1487
}
1486
}
1488
1487

Return to bug 272749