FreeCalypso > hg > freecalypso-sw
changeset 333:2ac2f6d88bb2
rvinterf & rvtdump: use the new libg23 for G23 packet decoding
| author | Michael Spacefalcon <msokolov@ivan.Harhan.ORG> |
|---|---|
| date | Tue, 22 Apr 2014 05:11:03 +0000 |
| parents | 28b4d3c9e85d |
| children | 73a2b359b3cd |
| files | rvinterf/Makefile rvinterf/lowlevel/Makefile rvinterf/lowlevel/format.c |
| diffstat | 3 files changed, 20 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- 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}
--- 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}
--- 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;