#define SITE_SENTMSG5 7
#define SITE_WAIT 8
+int32_t site_max_start_pad = 4*4;
+
static cstring_t state_name(uint32_t state)
{
switch (state) {
BUF_ALLOC(&st->buffer,"site:MSG5");
/* We are going to add four words to the message */
- buffer_init(&st->buffer,st->new_transform->max_start_pad+(4*4));
+ buffer_init(&st->buffer,calculate_max_start_pad());
/* Give the netlink code an opportunity to put its own stuff in the
message (configuration information, etc.) */
buf_prepend_uint32(&st->buffer,LABEL_MSG5);
BUF_ALLOC(&st->buffer,"site:MSG6");
/* We are going to add four words to the message */
- buffer_init(&st->buffer,transform->max_start_pad+(4*4));
+ buffer_init(&st->buffer,calculate_max_start_pad());
/* Give the netlink code an opportunity to put its own stuff in the
message (configuration information, etc.) */
buf_prepend_uint32(&st->buffer,LABEL_MSG6);
if (current_valid(st) && st->buffer.free
&& transport_peers_valid(&st->peers)) {
BUF_ALLOC(&st->buffer,"site:MSG7");
- buffer_init(&st->buffer,st->current.transform->max_start_pad+(4*3));
+ buffer_init(&st->buffer,calculate_max_start_pad());
buf_append_uint32(&st->buffer,LABEL_MSG7);
buf_append_string(&st->buffer,reason);
if (call_transform_forwards(st, st->current.transform,
st->sharedsecretlen=st->sharedsecretallocd=0;
st->sharedsecret=0;
- /* We need to compute some properties of our comms and transports */
-#define COMPUTE_WORST(things,pad) \
- int things##_worst_##pad=0; \
- for (i=0; i<st->n##things; i++) { \
- int thispad=st->things[i]->pad; \
- if (thispad > things##_worst_##pad) \
- things##_worst_##pad=thispad; \
- }
- COMPUTE_WORST(comms,min_start_pad)
- COMPUTE_WORST(transforms,max_start_pad)
-
for (i=0; i<st->ntransforms; i++) {
struct transform_if *ti=st->transforms[i];
uint32_t capbit = 1UL << ti->capab_transformnum;
}
/* We need to register the remote networks with the netlink device */
- st->netlink->reg(st->netlink->st, site_outgoing, st,
- transforms_worst_max_start_pad+(4*4)+
- comms_worst_min_start_pad);
+ st->netlink->reg(st->netlink->st, site_outgoing, st);
for (i=0; i<st->ncomms; i++)
st->comms[i]->request_notify(st->comms[i]->st, st, site_incoming);