TeamSpeak-Systems · nbuechner · Feb 15, 2020 · Feb 15, 2020 · Feb 15, 2020 · Feb 16, 2020
diff --git a/Makefile b/Makefile
@@ -8,7 +8,8 @@ clean:
 	$(MAKE) -C src -f Makefile.xtables clean;
 	$(MAKE) -C test clean;
 
-install:
+install: all
 	$(MAKE) -C src modules_install;
 	$(MAKE) -C src -f Makefile.xtables install;
+	depmod -a
 
diff --git a/src/Makefile b/src/Makefile
@@ -1,5 +1,6 @@
 # -*- Makefile -*-
-MODULES_DIR := /lib/modules/$(shell uname -r)
+KVER := $(shell uname -r)
+MODULES_DIR := /lib/modules/${KVER}
 KERNEL_DIR := ${MODULES_DIR}/build
 
 obj-m += xt_ts3init.o

diff --git a/src/Makefile.xtables b/src/Makefile.xtables
@@ -18,7 +18,7 @@ install:
 	fi
 
 lib%.so: lib%.o
-	gcc -shared -fPIC -o $@ $^;
+	gcc -shared -fPIC -o $@ $^ -lxtables;
 
 lib%.o: lib%.c
 	gcc ${CFLAGS} -D_INIT=lib$*_init -fPIC -c -o $@ $<;

diff --git a/src/ts3init_cache.c b/src/ts3init_cache.c
@@ -26,7 +26,7 @@
 struct ts3init_cache_t
 {
     unsigned long                  saved_jiffies;
-    time_t                         unix_time;
+    ktime_t                         unix_time;
     struct xt_ts3init_cookie_cache cookie_cache;
 };        
 
@@ -35,22 +35,21 @@ DEFINE_PER_CPU(struct ts3init_cache_t, ts3init_cache);
 static inline void update_cache_time(unsigned long jifs,
     struct ts3init_cache_t* cache)
 {
-    if (((long)jifs - (long)cache->saved_jiffies) >= HZ)
-    {
+    struct timespec64 now;
+    if (unlikely(((long)jifs - (long)cache->saved_jiffies) >= HZ)){
         /* it's been 1 second sinds last time update.
          * Get the new unix time and cache it*/
-       struct timeval tv;
        cache->saved_jiffies = jifs;
-       do_gettimeofday(&tv);
-       cache->unix_time = tv.tv_sec;
+       ktime_get_real_ts64(&now);
+       cache->unix_time = now.tv_sec;
    }
 }
 
-time_t ts3init_get_cached_unix_time(void)
+ktime_t ts3init_get_cached_unix_time(void)
 {
     struct ts3init_cache_t* cache;
     unsigned long jifs;
-    time_t current_unix_time;
+    ktime_t current_unix_time;
 
     jifs = jiffies;
 
@@ -70,7 +69,7 @@ bool ts3init_get_cookie_seed_for_packet_index(u8 packet_index, const u8* random_
     struct ts3init_cache_t* cache;
     u64* result;
     unsigned long jifs;
-    time_t current_unix_time;
+    ktime_t current_unix_time;
 
     jifs = jiffies;
     cache = &get_cpu_var(ts3init_cache);
@@ -96,7 +95,7 @@ bool ts3init_get_current_cookie_seed(const u8* random_seed, u64 (*cookie)[2], u8
     struct ts3init_cache_t* cache;
     u64* result;
     unsigned long jifs;
-    time_t current_unix_time;
+    ktime_t current_unix_time;
 
     jifs = jiffies;
     cache = &get_cpu_var(ts3init_cache);

diff --git a/src/ts3init_cache.h b/src/ts3init_cache.h
@@ -4,7 +4,7 @@
 /*
  * Returns the current unix_time from cache, updated once every second.
  */
-time_t ts3init_get_cached_unix_time(void);
+ktime_t ts3init_get_cached_unix_time(void);
 
 
 /*

diff --git a/src/ts3init_cookie.c b/src/ts3init_cookie.c
@@ -43,7 +43,7 @@
 static struct crypto_shash *sha512_tfm;
 
 
-static void check_update_seed_cache(time_t time, __u8 index, 
+static void check_update_seed_cache(ktime_t time, __u8 index, 
                 struct xt_ts3init_cookie_cache* cache,
                 const __u8* random_seed)
 {
@@ -58,7 +58,6 @@ static void check_update_seed_cache(time_t time, __u8 index,
     {
         SHASH_DESC_ON_STACK(shash, sha512_tfm);
         shash->tfm = sha512_tfm;
-        shash->flags = 0;
 
         ret = crypto_shash_init(shash);
         if (ret != 0)
@@ -86,23 +85,23 @@ static void check_update_seed_cache(time_t time, __u8 index,
     }
 }
 
-__u64* ts3init_get_cookie_seed(time_t current_time, __u8 packet_index, 
+__u64* ts3init_get_cookie_seed(ktime_t current_time, __u8 packet_index, 
                 struct xt_ts3init_cookie_cache* cache,
                 const __u8* random_seed)
 {
 
     __u8 current_cache_index;
     __u8 packet_cache_index;
-    time_t current_cache_time;
-    time_t packet_cache_time;
+    ktime_t current_cache_time;
+    ktime_t packet_cache_time;
 
     if (packet_index >= 8) return NULL;
 
     current_cache_index = (current_time % 8) / 4;
     packet_cache_index = packet_index / 4;
 
     /* get cache time of packet */
-    current_cache_time = current_time & ~((time_t)3);
+    current_cache_time = current_time & ~((ktime_t)3);
     packet_cache_time = current_cache_time 
         - ((current_cache_index ^ packet_cache_index)*4);
 

diff --git a/src/ts3init_cookie.h b/src/ts3init_cookie.h
@@ -9,7 +9,7 @@ enum
 
 struct xt_ts3init_cookie_cache
 {
-    time_t time[2];
+    ktime_t time[2];
     union
     {
         __u8 seed8[SHA512_SIZE*2];
@@ -22,7 +22,7 @@ struct xt_ts3init_cookie_cache
  * If the cookie seed is missing in cache it will be generated using 
  * random_seed and current_time
  */
-__u64* ts3init_get_cookie_seed(time_t current_time, __u8 packet_index, 
+__u64* ts3init_get_cookie_seed(ktime_t current_time, __u8 packet_index, 
                 struct xt_ts3init_cookie_cache* cache,
                 const __u8* random_seed);
 

diff --git a/src/ts3init_match.c b/src/ts3init_match.c
@@ -199,7 +199,7 @@ ts3init_get_cookie_mt(const struct sk_buff *skb, struct xt_action_param *par)
     if (info->specific_options & CHK_GET_COOKIE_CHECK_TIMESTAMP)
     {
         __u8 *payload, payload_buf[ts3init_payload_sizes[COMMAND_GET_COOKIE]];
-        time_t current_unix_time, packet_unix_time;
+        ktime_t current_unix_time, packet_unix_time;
 
         payload = get_payload(skb, par, &header_data, payload_buf, sizeof(payload_buf));
         if (!payload)
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ @@
     /*
      * Returns the current unix_time from cache, updated once every second.
      */
-    time_t ts3init_get_cached_unix_time(void);
+    ktime_t ts3init_get_cached_unix_time(void);
     /*
@@ Expand Down @@