Asterisk 10, 11, 13, 14 compatibility fixes. And a few other fixes.

.github/workflows/thanks-for-nothing-travis.yml

@@ -0,0 +1,44 @@
+name: Thanks for nothing, Travis
+
+on: [push, pull_request]
+
+jobs:
+
+  build:
+
+    strategy:
+      matrix:
+        include:
+          - title: Asterisk 13
+            asterisk_version: 13
+          - title: Asterisk 14
+            asterisk_version: 14
+          - title: Asterisk 16
+            asterisk_version: 16
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Download ${{ matrix.title }} prerequisites
+        env:
+          ASTVER: ${{ matrix.asterisk_version }}
+        run:
+          wget http://junk.devs.nu/a/asterisk/asterisk-$ASTVER-include.tar.bz2 &&
+          tar jxf asterisk-$ASTVER-include.tar.bz2
+
+      - name: Bootstrap and configure for ${{ matrix.title }}
+        env:
+          ASTVER: ${{ matrix.asterisk_version }}
+        run:
+          ./bootstrap &&
+          ./configure --with-astversion=$ASTVER
+              --with-asterisk=./asterisk-$ASTVER/include DESTDIR=/tmp
+              --enable-warnings-as-errors
+
+      - name: Build for ${{ matrix.title }}
+        run: make clean all
+
+      - name: Check
+        run: make check

.gitignore

@@ -0,0 +1,21 @@
+*.swp
+
+*.o
+*.o.d
+
+/chan_dongle.so
+
+/Makefile
+/aclocal.m4
+/autom4te.cache
+/compile
+/config.guess
+/config.h
+/config.log
+/config.status
+/config.sub
+/configure
+/install-sh
+/missing
+/stamp-h
+/stamp-h1

Makefile.in

@@ -3,30 +3,32 @@ PROJS =  chan_dongles.so
 
 chan_donglem_so_OBJS =  app.o at_command.o at_parse.o at_queue.o at_read.o at_response.o \
 	chan_dongle.o channel.o char_conv.o cli.o helpers.o manager.o \
-	memmem.o ringbuffer.o cpvt.o dc_config.o pdu.o mixbuffer.o pdiscovery.o
+	memmem.o ringbuffer.o cpvt.o dc_config.o pdu.o mixbuffer.o pdiscovery.o error.o smsdb.o
 
 chan_dongles_so_OBJS = single.o
 
-test1_OBJS = test/test1.o ringbuffer.o mixbuffer.o
-parse_OBJS = test/parse.o at_parse.o char_conv.o pdu.o
+test1_OBJS = test/test1.o ringbuffer.o mixbuffer.o error.o
+gen_OBJS = test/gen.o char_conv.o pdu.o error.o
+parse_OBJS = test/parse.o at_parse.o char_conv.o pdu.o error.o
 discovery_OBJS = tools/discovery.o tools/tty.o
 
 SOURCES = app.c at_command.c at_parse.c at_queue.c at_read.c at_response.c \
 	chan_dongle.c channel.c char_conv.c cli.c cpvt.c dc_config.c helpers.c \
-	manager.c memmem.c ringbuffer.c single.c pdu.c mixbuffer.c pdiscovery.c
+	manager.c memmem.c ringbuffer.c single.c pdu.c mixbuffer.c pdiscovery.c \
+	error.c smsdb.c
 
-test_SOURCES = test/test1.c test/parse.c
+test_SOURCES = test/test1.c test/parse.c test/gen.c
 tools_SOURCES = tools/discovery.c tools/tty.c
 
 HEADERS = app.h at_command.h at_parse.h at_queue.h at_read.h at_response.h \
 	chan_dongle.h channel.h char_conv.h cli.h cpvt.h dc_config.h export.h \
 	helpers.h manager.h memmem.h ringbuffer.h pdu.h mixbuffer.h pdiscovery.h \
-	mutils.h
+	mutils.h error.h smsdb.h
 
 tools_HEADERS = tools/tty.h
 
 EXTRA_DIST = BUGS COPYRIGHT.txt LICENSE.txt README.txt TODO.txt INSTALL \
-	Makefile.in config.h.in configure.in stamp-h.in etc contrib
+	Makefile.in config.h.in configure.ac stamp-h.in etc contrib
 
 BUILD_TOOLS = configure config.sub install-sh missing config.guess
 
@@ -38,7 +40,8 @@ INSTALL = @INSTALL@
 CHMOD = chmod
 
 # -DAST_MODULE=\"$(PROJM)\" -D_THREAD_SAFE
-CFLAGS  = @CFLAGS@ -I$(srcdir) @CPPFLAGS@ @DEFS@ @AC_CFLAGS@
+CFLAGS  = @CFLAGS@ -I$(srcdir) -std=gnu99 -DAST_MODULE_SELF_SYM=__internal_chan_dongle_self \
+	@CPPFLAGS@ @DEFS@ @AC_CFLAGS@
 LDFLAGS = @LDFLAGS@ 
 SOLINK  = @SOLINK@
 LIBS    = @LIBS@
@@ -51,7 +54,15 @@ all: @TARGET@
 
 install: all
 	$(STRIP) $(PROJM)
-	$(INSTALL) -m 755 $(PROJM) @DESTDIR@
+ifneq (@DESTDIR@,)
+	$(INSTALL) -m 644 $(PROJM) @DESTDIR@
+else
+	@echo >&2
+	@echo "*** Asterisk modules directory was not auto-detected." >&2
+	@echo "*** Please copy $(PROJM) to the appropriate modules directory yourself." >&2
+	@echo >&2
+	@false
+endif
 
 $(PROJM): $(chan_donglem_so_OBJS) Makefile
 	$(LD) $(LDFLAGS) $(SOLINK) -o $@ $(chan_donglem_so_OBJS) $(LIBS)
@@ -61,14 +72,22 @@ $(PROJS): $(chan_dongles_so_OBJS) Makefile
 	$(CHMOD) 755 $@
 	mv $@ chan_dongle.so
 
-.c.o:
+.c.o: Makefile config.h
 	$(CC) $(CFLAGS) $(MAKE_DEPS) -o $@ -c $<
 
-tests: test/test1 test/parse
+check: tests
+	./test/test1
+	./test/parse
+	./test/gen
+
+tests: test/test1 test/parse test/gen
 
 test/test1: $(test1_OBJS)
 	$(LD) $(LDFLAGS) -o $@ $(test1_OBJS) $(LIBS)
 
+test/gen: $(gen_OBJS)
+	$(LD) $(LDFLAGS) -o $@ $(gen_OBJS) $(LIBS)
+
 test/parse: $(parse_OBJS)
 	$(LD) $(LDFLAGS) -o $@ $(parse_OBJS) $(LIBS)
 
@@ -80,6 +99,11 @@ tools/discovery: $(discovery_OBJS)
 clean:
 	$(RM) $(PROJM) $(PROJS) *.o *.core .*.d autom4te.cache test/test1 test/*.o tools/discovery test/*.o
 
+distclean: clean
+	$(RM) Makefile aclocal.m4 compile \
+		config.guess config.h config.log config.status config.sub \
+		configure install-sh missing stamp-h stamp-h1
+
 dist: $(SOURCES) $(HEADERS) $(EXTRA_DIST) $(BUILD_TOOLS)
 	@mkdir $(DISTNAME) $(DISTNAME)/test $(DISTNAME)/tools
 	@cp -a $(SOURCES) $(HEADERS) $(EXTRA_DIST) $(BUILD_TOOLS) $(DISTNAME)
@@ -88,8 +112,8 @@ dist: $(SOURCES) $(HEADERS) $(EXTRA_DIST) $(BUILD_TOOLS)
 	tar czf $(DISTNAME).tgz $(DISTNAME) --exclude .svn -h
 	@$(RM) $(DISTNAME)
 
-${srcdir}/configure: configure.in
-	cd ${srcdir} && autoconf
+configure: configure.ac
+	autoconf
 
 config.h: stamp-h
 stamp-h: config.h.in config.status