===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/systat/pftop.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -c -r1.25 -r1.26
*** src/usr.bin/systat/pftop.c	2014/04/26 11:27:23	1.25
--- src/usr.bin/systat/pftop.c	2014/04/26 11:28:49	1.26
***************
*** 1,4 ****
! /* $OpenBSD: pftop.c,v 1.25 2014/04/26 11:27:23 sthen Exp $	 */
  /*
   * Copyright (c) 2001, 2007 Can Erkin Acar
   * Copyright (c) 2001 Daniel Hartmeier
--- 1,4 ----
! /* $OpenBSD: pftop.c,v 1.26 2014/04/26 11:28:49 sthen Exp $	 */
  /*
   * Copyright (c) 2001, 2007 Can Erkin Acar
   * Copyright (c) 2001 Daniel Hartmeier
***************
*** 372,378 ****
  		return sortdir;
  	if (e2 == NULL)
  		return -sortdir;
! 	
  	if (e2->rate > e1 -> rate)
  		return sortdir;
  	if (e2->rate < e1 -> rate)
--- 372,378 ----
  		return sortdir;
  	if (e2 == NULL)
  		return -sortdir;
! 
  	if (e2->rate > e1 -> rate)
  		return sortdir;
  	if (e2->rate < e1 -> rate)
***************
*** 390,396 ****
  		return -sortdir;
  	if (e1 == NULL || e2 == NULL)
  		return 0;
! 	
  	if (e2->peak > e1 -> peak)
  		return sortdir;
  	if (e2->peak < e1 -> peak)
--- 390,396 ----
  		return -sortdir;
  	if (e1 == NULL || e2 == NULL)
  		return 0;
! 
  	if (e2->peak > e1 -> peak)
  		return sortdir;
  	if (e2->peak < e1 -> peak)
***************
*** 427,433 ****
  			return -1;
  		break;
  	}
! 	
  	return 0;
  }
  
--- 427,433 ----
  			return -1;
  		break;
  	}
! 
  	return 0;
  }
  
***************
*** 446,452 ****
  	if (s1->key[side].af < s2->key[side].af)
  		return -sortdir;
  
!        	ii = io = 0;
  
  	if (dir == PF_OUT)	/* looking for source addr */
  		io = 1;
--- 446,452 ----
  	if (s1->key[side].af < s2->key[side].af)
  		return -sortdir;
  
! 	ii = io = 0;
  
  	if (dir == PF_OUT)	/* looking for source addr */
  		io = 1;
***************
*** 513,519 ****
  	if (s1->key[side].af < s2->key[side].af)
  		return -sortdir;
  
!        	ii = io = 0;
  
  	if (dir == PF_OUT)	/* looking for source addr */
  		io = 1;
--- 513,519 ----
  	if (s1->key[side].af < s2->key[side].af)
  		return -sortdir;
  
! 	ii = io = 0;
  
  	if (dir == PF_OUT)	/* looking for source addr */
  		io = 1;
***************
*** 729,743 ****
  void
  tb_print_addr(struct pf_addr * addr, struct pf_addr * mask, int af)
  {
!         	switch (af) {
!         	case AF_INET: {
  			tbprintf("%s", inetname(addr->v4));
  			break;
!         	}
!         	case AF_INET6: {
  			tbprintf("%s", inet6name(&addr->v6));
  			break;
!         	}
  	}
  
  	if (mask != NULL) {
--- 729,743 ----
  void
  tb_print_addr(struct pf_addr * addr, struct pf_addr * mask, int af)
  {
! 		switch (af) {
! 		case AF_INET: {
  			tbprintf("%s", inetname(addr->v4));
  			break;
! 		}
! 		case AF_INET6: {
  			tbprintf("%s", inet6name(&addr->v6));
  			break;
! 		}
  	}
  
  	if (mask != NULL) {
***************
*** 795,808 ****
  		unsigned int s1, unsigned int s2)
  {
  	int len;
! 	
  	if (fld == NULL)
  		return;
  
  	len = fld->width;
  	if (len < 1)
  		return;
! 	
  	tb_start();
  
  	if (proto == IPPROTO_TCP) {
--- 795,808 ----
  		unsigned int s1, unsigned int s2)
  {
  	int len;
! 
  	if (fld == NULL)
  		return;
  
  	len = fld->width;
  	if (len < 1)
  		return;
! 
  	tb_start();
  
  	if (proto == IPPROTO_TCP) {
***************
*** 1252,1258 ****
  			tb_print_port(src->port_op, src->port[0],
  				      src->port[1],
  				      proto == IPPROTO_TCP ? "tcp" : "udp");
! 		
  		tbprintf("to ");
  		if (PT_NOROUTE(dst))
  			tbprintf("no-route ");
--- 1252,1258 ----
  			tb_print_port(src->port_op, src->port[0],
  				      src->port[1],
  				      proto == IPPROTO_TCP ? "tcp" : "udp");
! 
  		tbprintf("to ");
  		if (PT_NOROUTE(dst))
  			tbprintf("no-route ");
***************
*** 1469,1475 ****
  print_rules(void)
  {
  	u_int32_t n, count = 0;
! 	
  	for (n = dispstart; n < num_rules; n++) {
  		print_rule(rules + n);
  		count ++;
--- 1469,1475 ----
  print_rules(void)
  {
  	u_int32_t n, count = 0;
! 
  	for (n = dispstart; n < num_rules; n++) {
  		print_rule(rules + n);
  		count ++;