projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Create/bind TCP and UDP listening sockets in pairs.
[tinc]
/
src
/
protocol_key.c
diff --git
a/src/protocol_key.c
b/src/protocol_key.c
index
621bb1b
..
b85de5e
100644
(file)
--- a/
src/protocol_key.c
+++ b/
src/protocol_key.c
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: protocol_key.c,v 1.1.4.
2 2002/02/11 15:59:18
guus Exp $
+ $Id: protocol_key.c,v 1.1.4.
4 2002/02/27 22:37:55
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-41,7
+41,7
@@
#include "connection.h"
#include "node.h"
#include "edge.h"
#include "connection.h"
#include "node.h"
#include "edge.h"
-\
+
#include "system.h"
int mykeyused = 0;
#include "system.h"
int mykeyused = 0;
@@
-208,7
+208,7
@@
cp
if(to != myself)
{
if(to != myself)
{
- return send_request(to->nexthop->connection, c->buffer);
+ return send_request(to->nexthop->connection,
"%s",
c->buffer);
}
/* Update our copy of the origin's packet key */
}
/* Update our copy of the origin's packet key */
@@
-245,6
+245,8
@@
cp
from->cipher = NULL;
}
from->cipher = NULL;
}
+ from->maclength = maclength;
+
if(digest)
{
from->digest = EVP_get_digestbynid(digest);
if(digest)
{
from->digest = EVP_get_digestbynid(digest);
@@
-253,7
+255,6
@@
cp
syslog(LOG_ERR, _("Node %s (%s) uses unknown digest!"), from->name, from->hostname);
return -1;
}
syslog(LOG_ERR, _("Node %s (%s) uses unknown digest!"), from->name, from->hostname);
return -1;
}
- from->maclength = maclength;
if(from->maclength > from->digest->md_size || from->maclength < 0)
{
syslog(LOG_ERR, _("Node %s (%s) uses bogus MAC length!"), from->name, from->hostname);
if(from->maclength > from->digest->md_size || from->maclength < 0)
{
syslog(LOG_ERR, _("Node %s (%s) uses bogus MAC length!"), from->name, from->hostname);
@@
-263,7
+264,6
@@
cp
else
{
from->digest = NULL;
else
{
from->digest = NULL;
- from->maclength = maclength;
}
from->compression = compression;
}
from->compression = compression;