X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fnet%2Fax25.c;h=3d5ac3431f0d82059e0836416da318f69e036647;hb=48be7b04e1c0ff573b18251326a104af32b1c658;hp=889136595f52997830d310eb5cf342bce1d6f12e;hpb=63a35af8aab90ed049447a2837666a52f13b9598;p=bertos.git

diff --git a/bertos/net/ax25.c b/bertos/net/ax25.c
index 88913659..3d5ac343 100644
--- a/bertos/net/ax25.c
+++ b/bertos/net/ax25.c
@@ -34,7 +34,6 @@
  * For now, only UI frames without any Layer 3 protocol are handled.
  * This however is enough to send/receive APRS packets.
  *
- * \version $Id$
  * \author Francesco Sacchi <batt@develer.com>
  *
  */
@@ -54,7 +53,8 @@
 #define DECODE_CALL(buf, addr) \
 	for (unsigned i = 0; i < sizeof((addr)); i++) \
 	{ \
-		(addr)[i] = *(buf)++ >> 1; \
+		char c = (*(buf)++ >> 1); \
+		(addr)[i] = (c == ' ') ? '\x0' : c; \
 	}
 
 static void ax25_decode(AX25Ctx *ctx)
@@ -63,7 +63,6 @@ static void ax25_decode(AX25Ctx *ctx)
 	uint8_t *buf = ctx->buf;
 
 	DECODE_CALL(buf, msg.dst.call);
-	ASSERT(!(*buf & 0x01));
 	msg.dst.ssid = (*buf++ >> 1) & 0x0F;
 
 	DECODE_CALL(buf, msg.src.call);
@@ -112,6 +111,17 @@ static void ax25_decode(AX25Ctx *ctx)
 		ctx->hook(&msg);
 }
 
+
+/**
+ * Check if there are any AX25 messages to be processed.
+ * This function read available characters from the medium and search for
+ * any AX25 messages.
+ * If a message is found it is decoded and the linked callback executed.
+ * This function may be blocking if there are no available chars and the KFile
+ * used in \a ctx to access the medium is configured in blocking mode.
+ *
+ * \param ctx AX25 context to operate on.
+ */
 void ax25_poll(AX25Ctx *ctx)
 {
 	int c;
@@ -183,7 +193,7 @@ static void ax25_putchar(AX25Ctx *ctx, uint8_t c)
 	kfile_putc(c, ctx->ch);
 }
 
-static void ax25_sendCall(AX25Ctx *ctx, const AX25Call *addr)
+static void ax25_sendCall(AX25Ctx *ctx, const AX25Call *addr, bool last)
 {
 	unsigned len = MIN(sizeof(addr->call), strlen(addr->call));
 
@@ -199,20 +209,35 @@ static void ax25_sendCall(AX25Ctx *ctx, const AX25Call *addr)
 	if (len < sizeof(addr->call))
 		for (unsigned i = 0; i < sizeof(addr->call) - len; i++)
 			ax25_putchar(ctx, ' ' << 1);
+
+	/* The bit0 of last call SSID should be set to 1 */
+	uint8_t ssid = addr->ssid << 1 | (last ? 0x01 : 0);
+	ax25_putchar(ctx, ssid);
 }
 
-void ax25_send(AX25Ctx *ctx, const AX25Call *dst, const AX25Call *src, const void *_buf, size_t len)
+/**
+ * Send an AX25 frame on the channel through a specific path.
+ * \param ctx AX25 context to operate on.
+ * \param path An array of callsigns used as path, \see AX25_PATH for
+ *        an handy way to create a path.
+ * \param path_len callsigns path lenght.
+ * \param _buf payload buffer.
+ * \param len length of the payload.
+ */
+void ax25_sendVia(AX25Ctx *ctx, const AX25Call *path, size_t path_len, const void *_buf, size_t len)
 {
 	const uint8_t *buf = (const uint8_t *)_buf;
+	ASSERT(path);
+	ASSERT(path_len >= 2);
 
 	ctx->crc_out = CRC_CCITT_INIT_VAL;
 	kfile_putc(HDLC_FLAG, ctx->ch);
 
-	ax25_sendCall(ctx, dst);
-	ax25_putchar(ctx, dst->ssid << 1);
 
-	ax25_sendCall(ctx, src);
-	ax25_putchar(ctx, (src->ssid << 1) | 0x01);
+	/* Send call */
+	for (size_t i = 0; i < path_len; i++)
+		ax25_sendCall(ctx, &path[i], (i == path_len - 1));
+
 	ax25_putchar(ctx, AX25_CTRL_UI);
 	ax25_putchar(ctx, AX25_PID_NOLAYER3);
 
@@ -233,6 +258,44 @@ void ax25_send(AX25Ctx *ctx, const AX25Call *dst, const AX25Call *src, const voi
 	kfile_putc(HDLC_FLAG, ctx->ch);
 }
 
+static void print_call(KFile *ch, const AX25Call *call)
+{
+	kfile_printf(ch, "%.6s", call->call);
+	if (call->ssid)
+		kfile_printf(ch, "-%d", call->ssid);
+}
+
+/**
+ * Print a AX25 message in TNC-2 packet monitor format.
+ * \param ch a kfile channel where the message will be printed.
+ * \param msg the message to be printed.
+ */
+void ax25_print(KFile *ch, const AX25Msg *msg)
+{
+	print_call(ch, &msg->src);
+	kfile_putc('>', ch);
+	print_call(ch, &msg->dst);
+
+	#if CONFIG_AX25_RPT_LST
+	for (int i = 0; i < msg->rpt_cnt; i++)
+	{
+		kfile_putc(',', ch);
+		print_call(ch, &msg->rpt_lst[i]);
+		// TODO: add * to the trasmitting digi
+	}
+	#endif
+
+	kfile_printf(ch, ":%.*s\n", msg->len, msg->info);
+}
+
+
+/**
+ * Init the AX25 protocol decoder.
+ *
+ * \param ctx AX25 context to init.
+ * \param channel Used to gain access to the physical medium
+ * \param hook Callback function called when a message is received
+ */
 void ax25_init(AX25Ctx *ctx, KFile *channel, ax25_callback_t hook)
 {
 	ASSERT(ctx);