packet: Define a global default maximum size for IKE packets

This commit is contained in:
Tobias Brunner 2014-09-16 15:38:38 +02:00
parent 03512c47bf
commit f00a9c1715
5 changed files with 9 additions and 18 deletions

View File

@ -68,11 +68,6 @@
*/
#define MAX_NAT_D_PAYLOADS 10
/**
* Maximum packet size for fragmented packets (same as in sockets)
*/
#define MAX_PACKET 10000
/**
* A payload rule defines the rules for a payload
* in a specific message rule. It defines if and how
@ -2956,7 +2951,7 @@ message_t *message_create_defrag(message_t *fragment)
}
INIT(this->frag,
.max_packet = lib->settings->get_int(lib->settings,
"%s.max_packet", MAX_PACKET, lib->ns),
"%s.max_packet", PACKET_MAX_DEFAULT, lib->ns),
);
return &this->public;
}

View File

@ -45,9 +45,6 @@
#include <daemon.h>
#include <threading/thread.h>
/* Maximum size of a packet */
#define MAX_PACKET 10000
/* these are not defined on some platforms */
#ifndef SOL_IP
#define SOL_IP IPPROTO_IP
@ -739,7 +736,7 @@ socket_default_socket_t *socket_default_socket_create()
.natt = lib->settings->get_int(lib->settings,
"%s.port_nat_t", CHARON_NATT_PORT, lib->ns),
.max_packet = lib->settings->get_int(lib->settings,
"%s.max_packet", MAX_PACKET, lib->ns),
"%s.max_packet", PACKET_MAX_DEFAULT, lib->ns),
.set_source = lib->settings->get_bool(lib->settings,
"%s.plugins.socket-default.set_source", TRUE,
lib->ns),

View File

@ -42,9 +42,6 @@
#include <threading/rwlock.h>
#include <collections/hashtable.h>
/* Maximum size of a packet */
#define MAX_PACKET 10000
/* these are not defined on some platforms */
#ifndef SOL_IP
#define SOL_IP IPPROTO_IP
@ -668,7 +665,7 @@ socket_dynamic_socket_t *socket_dynamic_socket_create()
},
.lock = rwlock_create(RWLOCK_TYPE_DEFAULT),
.max_packet = lib->settings->get_int(lib->settings,
"%s.max_packet", MAX_PACKET, lib->ns),
"%s.max_packet", PACKET_MAX_DEFAULT, lib->ns),
);
if (pipe(this->notify) != 0)

View File

@ -25,9 +25,6 @@
#include <mswsock.h>
/* Maximum size of a packet */
#define MAX_PACKET 10000
/* number of sockets in use */
#define SOCKET_COUNT 2
@ -458,7 +455,7 @@ socket_win_socket_t *socket_win_socket_create()
"%s.port_nat_t", CHARON_NATT_PORT, lib->ns),
},
.max_packet = lib->settings->get_int(lib->settings,
"%s.max_packet", MAX_PACKET, lib->ns),
"%s.max_packet", PACKET_MAX_DEFAULT, lib->ns),
);
for (i = 0; i < SOCKET_COUNT; i++)

View File

@ -28,6 +28,11 @@ typedef struct packet_t packet_t;
#include <library.h>
#include <networking/host.h>
/**
* Maximum packet size we handle by default
*/
#define PACKET_MAX_DEFAULT 10000
/**
* Abstraction of an IP/UDP-Packet, contains data, sender and receiver.
*/