Rename result.h to packet.h

Include packet struct in it.
yarrick · Mar 26, 2021 · 4e0f704 · 4e0f704
1 parent cbaccfc
commit 4e0f704
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 16 deletions.
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 
 all: scsniff
 
-DEPS = result.h atr.h session.h pps.h data.h
+DEPS = packet.h atr.h session.h pps.h data.h
 CFLAGS = -std=c99 -Wall -pedantic -Wtype-limits
 MODULES = atr.o data.o pps.o session.o serial.o
 

diff --git a/atr.h b/atr.h
@@ -1,7 +1,7 @@
 #ifndef SCSNIFF_ATR_H
 #define SCSNIFF_ATR_H
 
-#include "result.h"
+#include "packet.h"
 
 #define ATR_TS_DIRECT (0x3B)
 #define ATR_TS_INVERSE (0x3F)

diff --git a/data.h b/data.h
@@ -1,7 +1,7 @@
 #ifndef SCSNIFF_DATA_H
 #define SCSNIFF_DATA_H
 
-#include "result.h"
+#include "packet.h"
 
 enum data_t0_state {
     COMMAND = 0,

diff --git a/result.h → packet.h b/result.h → packet.h
@@ -1,5 +1,7 @@
-#ifndef SCSNIFF_RESULT_H
-#define SCSNIFF_RESULT_H
+#ifndef SCSNIFF_PACKET_H
+#define SCSNIFF_PACKET_H
+
+#include <sys/time.h>
 
 enum result {
     CONTINUE = 0,      // Need more bytes
@@ -10,4 +12,11 @@ enum result {
     NOISE = 100,       // Suspected noise, ignored
 };
 
-#endif // SCSNIFF_RESULT_H
+struct packet {
+    unsigned char *data;
+    unsigned data_length;
+    enum result result;
+    struct timeval time;
+};
+
+#endif // SCSNIFF_PACKET_H
diff --git a/pps.h b/pps.h
@@ -1,7 +1,7 @@
 #ifndef SCSNIFF_PPS_H
 #define SCSNIFF_PPS_H
 
-#include "result.h"
+#include "packet.h"
 
 struct pps_msg {
     unsigned bytes_seen;

diff --git a/scsniff.c b/scsniff.c
@@ -5,7 +5,7 @@
 #include <unistd.h>
 #include <sys/time.h>
 
-#include "result.h"
+#include "packet.h"
 #include "serial.h"
 #include "session.h"
 

diff --git a/session.h b/session.h
@@ -3,7 +3,7 @@
 
 #include <sys/time.h>
 
-#include "result.h"
+#include "packet.h"
 #include "atr.h"
 #include "data.h"
 #include "pps.h"
@@ -19,13 +19,6 @@ enum session_state {
 
 #define SESSION_BUFLEN (512)
 
-struct packet {
-    unsigned char *data;
-    unsigned data_length;
-    enum result result;
-    struct timeval time;
-};
-
 typedef void (*set_baudrate_fn)(int fd, unsigned baudrate);
 
 typedef void (*completed_packet_fn)(struct packet *packet);