Ondrej Zajicek 6abc22f4b0 Merge commit '6ac4f87a2d661c739e55a63577e7bccf696c7abd' into integrated ...

Conflicts:

	lib/socket.h
	proto/ospf/config.Y
	proto/ospf/iface.c
	proto/ospf/ospf.h
	proto/rip/rip.c
	sysdep/bsd/sysio.h
	sysdep/linux/sysio.h
	sysdep/unix/io.c

2013-07-31 16:29:34 +02:00

..

config.Y

Merge commit '6ac4f87a2d661c739e55a63577e7bccf696c7abd' into integrated

2013-07-31 16:29:34 +02:00

dbdes.c

Temporary OSPF commit.

2013-04-16 01:14:57 +02:00

dbdes.h

Temporary OSPFv3 development commit

2009-08-21 09:27:52 +02:00

Doc

Doc.

2000-06-07 23:23:37 +00:00

hello.c

Merge commit '8df02847e8af29863c325b7297e3a2b2ed5f961c' into integrated

2013-05-23 00:16:19 +02:00

hello.h

Removes timers for stub interfaces. Also fixes some minor bugs.

2011-07-08 01:14:52 +02:00

iface.c

Merge commit '6ac4f87a2d661c739e55a63577e7bccf696c7abd' into integrated

2013-07-31 16:29:34 +02:00

iface.h

Temporary integrated commit (OSPF), unfinished.

2012-10-19 16:26:51 +02:00

lsack.c

Temporary integrated commit (OSPF), unfinished.

2012-10-02 11:44:05 +02:00

lsack.h

Temporary OSPFv3 development commit

2009-08-21 09:27:52 +02:00

lsalib.c

Temporary OSPF commit.

2013-06-28 01:01:21 +02:00

lsalib.h

Temporary integrated commit (OSPF), unfinished.

2012-10-02 11:44:05 +02:00

lsreq.c

Temporary OSPF commit.

2013-04-16 01:14:57 +02:00

lsreq.h

Temporary OSPFv3 development commit

2009-08-21 09:27:52 +02:00

lsupd.c

Temporary OSPF commit.

2013-06-28 01:01:21 +02:00

lsupd.h

Temporary OSPF commit.

2013-04-16 01:14:57 +02:00

Makefile

Routing table calculation. Dijkstra done.

2000-04-26 12:54:23 +00:00

neighbor.c

Temporary OSPF commit.

2013-04-16 01:14:57 +02:00

neighbor.h

Vastly improved OSPF reconfiguration.

2011-03-17 15:53:36 +01:00

ospf.c

Merge commit 'f623ab9875cad2d129f708e95021d3a252930000' into integrated

2013-07-30 21:59:36 +02:00

ospf.h

Merge commit '6ac4f87a2d661c739e55a63577e7bccf696c7abd' into integrated

2013-07-31 16:29:34 +02:00

packet.c

Merge commit '6ac4f87a2d661c739e55a63577e7bccf696c7abd' into integrated

2013-07-31 16:29:34 +02:00

packet.h

Temporary integrated commit (OSPF), unfinished.

2012-10-19 16:26:51 +02:00

rt.c

Merge commit 'f623ab9875cad2d129f708e95021d3a252930000' into integrated

2013-07-30 21:59:36 +02:00

rt.h

Temporary integrated commit.

2012-06-23 10:13:32 +02:00

topology.c

Merge commit 'f623ab9875cad2d129f708e95021d3a252930000' into integrated

2013-07-30 21:59:36 +02:00

topology.h

Temporary OSPF commit.

2013-06-28 01:01:21 +02:00