Skip to content

U
uniset2
Commit eadcab11 authored by Pavel Vainerman's avatar Pavel Vainerman
Browse files
Options

Merge branch 'unet2' of git.eter:/projects/uniset into unet2

Conflicts: extensions/UDPExchange/UNetReceiver.cc extensions/UDPExchange/UNetSender.cc extensions/UDPExchange/UNetSender.h
parents ecf9499b 02ce365d
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
extensions/UDPExchange/UDPReceiver.cc
View file @ eadcab11
...@@ -300,8 +300,8 @@ void UDPReceiver::recv() ...@@ -300,8 +300,8 @@ void UDPReceiver::recv()
} }
// cerr << myname << "(receive): recv DATA OK. ret=" << ret << " sizeof=" << sz cerr << myname << "(receive): recv DATA OK. ret=" << ret << " sizeof=" << sz
// << " header: " << pack.msg.header << endl; << " header: " << pack.msg.header << endl;
/* /*
if( labs(pack.msg.header.num - pnum) > 1 ) if( labs(pack.msg.header.num - pnum) > 1 )
{ {
......
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