# HG changeset patch
# User Michael Spacefalcon <msokolov@ivan.Harhan.ORG>
# Date 1398143463 0
# Node ID 2ac2f6d88bb20077147501209ce3240eb0570b4a
# Parent  28b4d3c9e85d7a85e9763379e873892915354521
rvinterf & rvtdump: use the new libg23 for G23 packet decoding

diff -r 28b4d3c9e85d -r 2ac2f6d88bb2 rvinterf/Makefile
--- a/rvinterf/Makefile	Tue Apr 22 05:03:39 2014 +0000
+++ b/rvinterf/Makefile	Tue Apr 22 05:11:03 2014 +0000
@@ -4,6 +4,8 @@
 
 all:	${SUBDIR}
 
+lowlevel:	libg23
+
 ${SUBDIR}: FRC
 	cd $@; ${MAKE} ${MFLAGS}
 
diff -r 28b4d3c9e85d -r 2ac2f6d88bb2 rvinterf/lowlevel/Makefile
--- a/rvinterf/lowlevel/Makefile	Tue Apr 22 05:03:39 2014 +0000
+++ b/rvinterf/lowlevel/Makefile	Tue Apr 22 05:11:03 2014 +0000
@@ -2,19 +2,20 @@
 CFLAGS=	-O2
 PROGS=	rvtdump rvinterf
 INSTBIN=/usr/local/bin
-
-RVTDUMP_OBJS=	format.o format_g23.o openport.o output.o packetrx.o rvtdump.o
+LIBG23=	../libg23/libg23.a
 
-RVINTERF_OBJS=	clientcmd.o format.o format_g23.o localsock.o logsent.o \
-		openport.o output.o packetrx.o packettx.o pktfwd.o rvifmain.o
+RVTDUMP_OBJS=	format.o openport.o output.o packetrx.o rvtdump.o
+
+RVINTERF_OBJS=	clientcmd.o format.o localsock.o logsent.o openport.o output.o \
+		packetrx.o packettx.o pktfwd.o rvifmain.o
 
 all:	${PROGS}
 
-rvtdump:	${RVTDUMP_OBJS}
-	${CC} ${CFLAGS} -o $@ ${RVTDUMP_OBJS}
+rvtdump:	${RVTDUMP_OBJS} ${LIBG23}
+	${CC} ${CFLAGS} -o $@ ${RVTDUMP_OBJS} ${LIBG23}
 
-rvinterf:	${RVINTERF_OBJS}
-	${CC} ${CFLAGS} -o $@ ${RVINTERF_OBJS}
+rvinterf:	${RVINTERF_OBJS} ${LIBG23}
+	${CC} ${CFLAGS} -o $@ ${RVINTERF_OBJS} ${LIBG23}
 
 install:	${PROGS}
 	mkdir -p ${INSTBIN}
diff -r 28b4d3c9e85d -r 2ac2f6d88bb2 rvinterf/lowlevel/format.c
--- a/rvinterf/lowlevel/format.c	Tue Apr 22 05:03:39 2014 +0000
+++ b/rvinterf/lowlevel/format.c	Tue Apr 22 05:11:03 2014 +0000
@@ -13,7 +13,7 @@
 extern u_char rxpkt[];
 extern size_t rxpkt_len;
 
-char fmtbuf[MAX_PKT_FROM_TARGET*8];	/* size it generously */
+static char fmtbuf[MAX_PKT_FROM_TARGET*8];	/* size it generously */
 
 void
 print_rv_trace()
@@ -96,6 +96,14 @@
 }
 
 void
+print_g23_trace()
+{
+	/* messy logic factored out into libg23 */
+	format_g23_packet(rxpkt, (int)rxpkt_len, fmtbuf);
+	output_line(fmtbuf);
+}
+
+void
 print_etm_output_raw()
 {
 	int i;