embedaddon/quagga/ospfd/ospf_dump.c - diff

Return to ospf_dump.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / quagga / ospfd

Diff for /embedaddon/quagga/ospfd/ospf_dump.c between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2012/05/29 11:53:41	version 1.1.1.3, 2016/11/02 10:09:12
Line 143 unsigned long term_debug_ospf_lsa = 0;	Line 143 unsigned long term_debug_ospf_lsa = 0;
unsigned long term_debug_ospf_zebra = 0;	unsigned long term_debug_ospf_zebra = 0;
unsigned long term_debug_ospf_nssa = 0;	unsigned long term_debug_ospf_nssa = 0;




const char *	const char *
ospf_redist_string(u_int route_type)	ospf_redist_string(u_int route_type)
{	{
Line 218 ospf_if_name_string (struct ospf_interface *oi)	Line 218 ospf_if_name_string (struct ospf_interface *oi)
return buf;	return buf;
}	}


void	void
ospf_nbr_state_message (struct ospf_neighbor nbr, char buf, size_t size)	ospf_nbr_state_message (struct ospf_neighbor nbr, char buf, size_t size)
{	{
Line 247 ospf_timeval_dump (struct timeval t, char buf, size_	Line 247 ospf_timeval_dump (struct timeval t, char buf, size_
#define HOUR_IN_SECONDS (60*MINUTE_IN_SECONDS)	#define HOUR_IN_SECONDS (60*MINUTE_IN_SECONDS)
#define DAY_IN_SECONDS (24*HOUR_IN_SECONDS)	#define DAY_IN_SECONDS (24*HOUR_IN_SECONDS)
#define WEEK_IN_SECONDS (7*DAY_IN_SECONDS)	#define WEEK_IN_SECONDS (7*DAY_IN_SECONDS)
unsigned long w, d, h, m, s, ms;	unsigned long w, d, h, m, s, ms, us;

if (!t)	if (!t)
return "inactive";	return "inactive";

w = d = h = m = s = ms = 0;	w = d = h = m = s = ms = us = 0;
memset (buf, 0, size);	memset (buf, 0, size);

ms = t->tv_usec / 1000;	us = t->tv_usec;
	if (us >= 1000)
	{
	ms = us / 1000;
	us %= 1000;
	}

if (ms >= 1000)	if (ms >= 1000)
{	{
t->tv_sec += ms / 1000;	t->tv_sec += ms / 1000;
Line 294 ospf_timeval_dump (struct timeval t, char buf, size_	Line 299 ospf_timeval_dump (struct timeval t, char buf, size_
else if (d)	else if (d)
snprintf (buf, size, "%1ldd%02ldh%02ldm", d, h, m);	snprintf (buf, size, "%1ldd%02ldh%02ldm", d, h, m);
else if (h)	else if (h)
snprintf (buf, size, "%ldh%02ldm%02lds", h, m, t->tv_sec);	snprintf (buf, size, "%ldh%02ldm%02lds", h, m, (long)t->tv_sec);
else if (m)	else if (m)
snprintf (buf, size, "%ldm%02lds", m, t->tv_sec);	snprintf (buf, size, "%ldm%02lds", m, (long)t->tv_sec);
	else if (ms)
	snprintf (buf, size, "%ld.%03lds", (long)t->tv_sec, ms);
else	else
snprintf (buf, size, "%ld.%03lds", t->tv_sec, ms);	snprintf (buf, size, "%ld usecs", (long)t->tv_usec);

return buf;	return buf;
}	}

Line 612 ospf_packet_ls_upd_dump (struct stream *s, u_int16_t l	Line 619 ospf_packet_ls_upd_dump (struct stream *s, u_int16_t l
case OSPF_AS_NSSA_LSA:	case OSPF_AS_NSSA_LSA:
ospf_as_external_lsa_dump (s, length);	ospf_as_external_lsa_dump (s, length);
break;	break;
#ifdef HAVE_OPAQUE_LSA
case OSPF_OPAQUE_LINK_LSA:	case OSPF_OPAQUE_LINK_LSA:
case OSPF_OPAQUE_AREA_LSA:	case OSPF_OPAQUE_AREA_LSA:
case OSPF_OPAQUE_AS_LSA:	case OSPF_OPAQUE_AS_LSA:
ospf_opaque_lsa_dump (s, length);	ospf_opaque_lsa_dump (s, length);
break;	break;
#endif /* HAVE_OPAQUE_LSA */
default:	default:
break;	break;
}	}
Line 746 ospf_packet_dump (struct stream *s)	Line 751 ospf_packet_dump (struct stream *s)
stream_set_getp (s, gp);	stream_set_getp (s, gp);
}	}


/*	/*
[no] debug ospf packet (hello\|dd\|ls-request\|ls-update\|ls-ack\|all)	[no] debug ospf packet (hello\|dd\|ls-request\|ls-update\|ls-ack\|all)
[send\|recv [detail]]	[send\|recv [detail]]
Line 895 DEFUN (no_debug_ospf_packet,	Line 900 DEFUN (no_debug_ospf_packet,
else if (strncmp (argv[1], "r", 1) == 0)	else if (strncmp (argv[1], "r", 1) == 0)
flag = OSPF_DEBUG_RECV \| OSPF_DEBUG_DETAIL;	flag = OSPF_DEBUG_RECV \| OSPF_DEBUG_DETAIL;
else if (strncmp (argv[1], "d", 1) == 0)	else if (strncmp (argv[1], "d", 1) == 0)
flag = OSPF_DEBUG_DETAIL;	flag = OSPF_DEBUG_SEND \| OSPF_DEBUG_RECV \| OSPF_DEBUG_DETAIL;
}	}

/* detail. */	/* detail. */
Line 956 ALIAS (no_debug_ospf_packet,	Line 961 ALIAS (no_debug_ospf_packet,
"Packet received\n"	"Packet received\n"
"Detail Information\n")	"Detail Information\n")


DEFUN (debug_ospf_ism,	DEFUN (debug_ospf_ism,
debug_ospf_ism_cmd,	debug_ospf_ism_cmd,
"debug ospf ism",	"debug ospf ism",
Line 1058 ALIAS (no_debug_ospf_ism,	Line 1063 ALIAS (no_debug_ospf_ism,
"ISM Event Information\n"	"ISM Event Information\n"
"ISM Timer Information\n")	"ISM Timer Information\n")


DEFUN (debug_ospf_nsm,	DEFUN (debug_ospf_nsm,
debug_ospf_nsm_cmd,	debug_ospf_nsm_cmd,
"debug ospf nsm",	"debug ospf nsm",
Line 1161 ALIAS (no_debug_ospf_nsm,	Line 1166 ALIAS (no_debug_ospf_nsm,
"NSM Event Information\n"	"NSM Event Information\n"
"NSM Timer Information\n")	"NSM Timer Information\n")


DEFUN (debug_ospf_lsa,	DEFUN (debug_ospf_lsa,
debug_ospf_lsa_cmd,	debug_ospf_lsa_cmd,
"debug ospf lsa",	"debug ospf lsa",
Line 1274 ALIAS (no_debug_ospf_lsa,	Line 1279 ALIAS (no_debug_ospf_lsa,
"LSA Install/Delete\n"	"LSA Install/Delete\n"
"LSA Refres\n")	"LSA Refres\n")


DEFUN (debug_ospf_zebra,	DEFUN (debug_ospf_zebra,
debug_ospf_zebra_cmd,	debug_ospf_zebra_cmd,
"debug ospf zebra",	"debug ospf zebra",
Line 1366 ALIAS (no_debug_ospf_zebra,	Line 1371 ALIAS (no_debug_ospf_zebra,
"OSPF Zebra information\n"	"OSPF Zebra information\n"
"Zebra interface\n"	"Zebra interface\n"
"Zebra redistribute\n")	"Zebra redistribute\n")

DEFUN (debug_ospf_event,	DEFUN (debug_ospf_event,
debug_ospf_event_cmd,	debug_ospf_event_cmd,
"debug ospf event",	"debug ospf event",
Line 1421 DEFUN (no_debug_ospf_nssa,	Line 1426 DEFUN (no_debug_ospf_nssa,
return CMD_SUCCESS;	return CMD_SUCCESS;
}	}


DEFUN (show_debugging_ospf,	DEFUN (show_debugging_ospf,
show_debugging_ospf_cmd,	show_debugging_ospf_cmd,
"show debugging ospf",	"show debugging ospf",

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.1.2
changed lines
	Added in v.1.1.1.3