From b3a2a6919bdebfd8fcc63d8f23501f86dff7beac Mon Sep 17 00:00:00 2001
From: H1ghBre4k3r <h1ghbre4k3r@dev.bre4k3r.de>
Date: Mon, 3 May 2021 21:47:02 +0200
Subject: [PATCH] Sequence Numbers: Introduce GET_MASKED_SN macro

---
 src/ens/sequencenumber.c |  8 ++------
 src/ens/sequencenumber.h | 10 +++-------
 src/ens/storage.c        |  2 +-
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/ens/sequencenumber.c b/src/ens/sequencenumber.c
index 5d3d514..0d9527c 100644
--- a/src/ens/sequencenumber.c
+++ b/src/ens/sequencenumber.c
@@ -1,13 +1,9 @@
 #include "sequencenumber.h"
 
-record_sequence_number_t sn_mask(record_sequence_number_t sn) {
-    return (sn & SN_MASK);
-}
-
 int sn_equal(record_sequence_number_t a, record_sequence_number_t b) {
-    return sn_mask(a) == sn_mask(b);
+    return GET_MASKED_SN(a) == GET_MASKED_SN(b);
 }
 
 record_sequence_number_t sn_increment(record_sequence_number_t sn) {
-    return sn_mask(++sn);
+    return GET_MASKED_SN(++sn);
 }
\ No newline at end of file
diff --git a/src/ens/sequencenumber.h b/src/ens/sequencenumber.h
index 5ba4795..e26b944 100644
--- a/src/ens/sequencenumber.h
+++ b/src/ens/sequencenumber.h
@@ -6,16 +6,12 @@
 // mask for sequence numbers (2^24 - 1)
 #define SN_MASK 16777215
 
-typedef uint32_t record_sequence_number_t;
-
 /**
  * Mask a given sequence number to get rid of MSB.
- * TODO: maybe as #define?
- *
- * @param sn sequence number to mask
- * @return masked sequence number
  */
-record_sequence_number_t sn_mask(record_sequence_number_t sn);
+#define GET_MASKED_SN(x) (x & SN_MASK)
+
+typedef uint32_t record_sequence_number_t;
 
 /**
  * Compare to sequence numbers for equality.
diff --git a/src/ens/storage.c b/src/ens/storage.c
index b397c8b..e4d7449 100644
--- a/src/ens/storage.c
+++ b/src/ens/storage.c
@@ -163,7 +163,7 @@ int delete_contact(record_sequence_number_t sn) {
 
 // TODO lome: do we need lock here aswell?
 record_sequence_number_t get_latest_sequence_number() {
-    return sn_mask(contact_information.oldest_contact + contact_information.count);
+    return GET_MASKED_SN((contact_information.oldest_contact + contact_information.count));
 }
 
 record_sequence_number_t get_oldest_sequence_number() {