From ce8c5b1cbb976bb506bb031b0a6b63bb9b98870e Mon Sep 17 00:00:00 2001
From: XANTRONIX Development <dev@xantronix.com>
Date: Thu, 16 Jul 2020 23:05:31 -0400
Subject: [PATCH] Initial code for handling XID in src/server.c

Write initial code for handling XID frames in src/server.c
---
 src/server.c | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/server.c b/src/server.c
index a012da9..f5bb650 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1311,6 +1311,13 @@ error_sock_resend:
     return -1;
 }
 
+static int handle_xid_param(enum patty_ax25_frame_xid_param_type type,
+                            size_t len,
+                            uint8_t *data,
+                            void *ctx) {
+    return 0;
+}
+
 static int handle_frame(patty_ax25_server *server,
                         patty_ax25_if *iface,
                         void *buf,
@@ -1318,13 +1325,15 @@ static int handle_frame(patty_ax25_server *server,
     patty_ax25_frame frame;
     enum patty_ax25_frame_format format = PATTY_AX25_FRAME_NORMAL;
 
-    ssize_t decoded;
+    ssize_t decoded,
+            offset = 0;
+
     patty_ax25_sock *sock;
 
     if ((decoded = patty_ax25_frame_decode_address(&frame, buf, len)) < 0) {
-        iface->stats.dropped++;
-
         goto error_io;
+    } else {
+        offset += decoded;
     }
 
     if ((sock = sock_by_addrpair(server->socks_established,
@@ -1335,10 +1344,10 @@ static int handle_frame(patty_ax25_server *server,
         }
     }
 
-    if (patty_ax25_frame_decode_control(&frame, format, buf, decoded, len) < 0) {
-        iface->stats.dropped++;
-
+    if ((decoded = patty_ax25_frame_decode_control(&frame, format, buf, offset, len)) < 0) {
         goto error_io;
+    } else {
+        offset += decoded;
     }
 
     switch (frame.type) {
@@ -1352,6 +1361,13 @@ static int handle_frame(patty_ax25_server *server,
         case PATTY_AX25_FRAME_SREJ:  return handle_srej(server, iface, sock, &frame);
         case PATTY_AX25_FRAME_FRMR:  return 0;
 
+        case PATTY_AX25_FRAME_XID:
+            if (patty_ax25_frame_decode_xid(handle_xid_param, buf, offset, len, sock) < 0) {
+                goto error_io;
+            }
+
+            break;
+
         default:
             break;
     }
@@ -1359,6 +1375,8 @@ static int handle_frame(patty_ax25_server *server,
     return 0;
 
 error_io:
+    iface->stats.dropped++;
+
     return -1;
 }