summaryrefslogtreecommitdiff
path: root/src/seq_window.c
diff options
context:
space:
mode:
authorChristian Pointner <equinox@anytun.org>2014-06-08 18:41:58 +0000
committerChristian Pointner <equinox@anytun.org>2014-06-08 18:41:58 +0000
commit1604cea7467a76866dcf4efc067d910712a869a0 (patch)
tree1aabbd79088761c025a0e45a7acfee96caff2e13 /src/seq_window.c
parentfixed errnous copy of remote end (diff)
merged most changes from rail branch to trunk
Diffstat (limited to 'src/seq_window.c')
-rw-r--r--src/seq_window.c22
1 files changed, 12 insertions, 10 deletions
diff --git a/src/seq_window.c b/src/seq_window.c
index 0f58adb..55be299 100644
--- a/src/seq_window.c
+++ b/src/seq_window.c
@@ -13,9 +13,9 @@
* message authentication based on the methodes used by SRTP. It is
* intended to deliver a generic, scaleable and secure solution for
* tunneling and relaying of packets of any protocol.
- *
*
- * Copyright (C) 2007-2010 Christian Pointner <equinox@anytun.org>
+ *
+ * Copyright (C) 2007-2014 Christian Pointner <equinox@anytun.org>
*
* This file is part of uAnytun.
*
@@ -67,9 +67,11 @@ void seq_win_clear(seq_win_t* win)
free(to_free);
}
+
+ win->first_ = NULL;
}
-seq_win_element_t* seq_win_new_element(sender_id_t sender_id, seq_nr_t max, window_size_t size)
+static seq_win_element_t* seq_win_new_element(sender_id_t sender_id, seq_nr_t max, window_size_t size)
{
if(!size)
return NULL;
@@ -81,7 +83,7 @@ seq_win_element_t* seq_win_new_element(sender_id_t sender_id, seq_nr_t max, wind
e->sender_id_ = sender_id;
e->max_ = max;
e->pos_ = 0;
- e->window_ = malloc(sizeof(seq_nr_t)*size);
+ e->window_ = malloc(sizeof((*e->window_))*size);
if(!e->window_) {
free(e);
return NULL;
@@ -152,12 +154,12 @@ int seq_win_check_and_add(seq_win_t* win, sender_id_t sender_id, seq_nr_t seq_nr
ptr->max_ -= SEQ_NR_MAX/2;
else if(shifted == 2)
ptr->max_ += SEQ_NR_MAX/2;
-
+
return 0;
}
-
+
seq_nr_t diff = ptr->max_ - seq_nr;
- window_size_t pos = diff > ptr->pos_ ? ptr->pos_ + win->size_ : ptr->pos_;
+ window_size_t pos = diff > ptr->pos_ ? ptr->pos_ + win->size_ : ptr->pos_;
pos -= diff;
if(shifted == 1)
@@ -170,7 +172,7 @@ int seq_win_check_and_add(seq_win_t* win, sender_id_t sender_id, seq_nr_t seq_nr
return ret;
}
ptr = ptr->next_;
- }
+ }
if(!win->first_) {
win->first_ = seq_win_new_element(sender_id, seq_nr, win->size_);
if(!win->first_)
@@ -184,7 +186,7 @@ int seq_win_check_and_add(seq_win_t* win, sender_id_t sender_id, seq_nr_t seq_nr
if(!ptr->next_)
return -2;
}
-
+
return 0;
}
@@ -204,7 +206,7 @@ void seq_win_print(seq_win_t* win)
printf("O");
else
printf(".");
-
+
if(i)
i--;
else