Commit a24bc5e0 authored by Juliusz Chroboczek's avatar Juliusz Chroboczek

Merge branch 'babeld-1.1-branch'

Conflicts:
	CHANGES
parents 00dd7fa2 33601f38
...@@ -4,6 +4,10 @@ babeld 1.2.0 (unreleased): ...@@ -4,6 +4,10 @@ babeld 1.2.0 (unreleased):
"-z" flag in the manual page. "-z" flag in the manual page.
* Fixed a memory leak when expiring resent messages. * Fixed a memory leak when expiring resent messages.
27 August 2011: babeld 1.1.4
* Change the default port number to 6696, as allocated by IANA.
3 August 2011: babeld 1.1.3 3 August 2011: babeld 1.1.3
* Implemented an option -u to keep unfeasible routes; this is useful * Implemented an option -u to keep unfeasible routes; this is useful
......
...@@ -122,7 +122,7 @@ main(int argc, char **argv) ...@@ -122,7 +122,7 @@ main(int argc, char **argv)
srandom(seed); srandom(seed);
parse_address("ff02:0:0:0:0:0:1:6", protocol_group, NULL); parse_address("ff02:0:0:0:0:0:1:6", protocol_group, NULL);
protocol_port = 6697; protocol_port = 6696;
while(1) { while(1) {
opt = getopt(argc, argv, "m:p:h:H:i:k:A:PsuS:d:g:lwz:t:T:c:C:DL:I:"); opt = getopt(argc, argv, "m:p:h:H:i:k:A:PsuS:d:g:lwz:t:T:c:C:DL:I:");
......
...@@ -24,7 +24,7 @@ The default is ...@@ -24,7 +24,7 @@ The default is
.TP .TP
.BI \-p " port" .BI \-p " port"
Specify the UDP port number to be used by the protocol. The default is Specify the UDP port number to be used by the protocol. The default is
.BR 6697 . .BR 6696 .
.TP .TP
.BI \-S " state-file" .BI \-S " state-file"
Set the name of the file used for preserving long-term information Set the name of the file used for preserving long-term information
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment