Merge pull request #521 from signalwire/verto

[mod_verto] Fix Makefile.am and reswig, fix scan-build warnings in swig and enable scan-build on Drone

.drone.yml

@@ -88,7 +88,6 @@ steps:
       - sed -i '/mod_rtmp/s/^/#/g' modules.conf
       - sed -i '/mod_skinny/s/^/#/g' modules.conf
       - sed -i '/mod_unimrcp/s/^/#/g' modules.conf
-      - sed -i '/mod_verto/s/^/#/g' modules.conf
       - sed -i '/mod_xml_rpc/s/^/#/g' modules.conf
       - ./configure
       - mkdir -p scan-build
@@ -121,6 +120,6 @@ trigger:
 
 ---
 kind: signature
-hmac: affb0747b0f16d9673cbbb327451c99fefc9dee2fd30b34b220bf147ad96a7be
+hmac: cddd8905a309e3deb7e5859b11aa1ec3593410d9f32ce2f5de3a3557af88f80f
 
 ...

src/mod/endpoints/mod_verto/Makefile.am

@@ -24,11 +24,11 @@ MCAST_la_LDFLAGS   = -avoid-version -module -no-undefined -shared $(PERL_LDFLAGS
 #	install -m 755 mcast/MCAST.pm $(DESTDIR)$(PERL_SITEDIR)
 endif
 
-mcast/esl_wrap.cpp:
+mcast/mcast_wrap.cpp:
-	cd mcast && swig -module MCAST -shadow -perl5 -c++ -DMULTIPLICITY -I../src/include -o mcast_wrap.cpp ../MCAST.i
+	cd mcast && swig -module MCAST -shadow -perl5 -c++ -DMULTIPLICITY -I../src/include -o mcast_wrap.cpp MCAST.i
 
 mcast/perlxsi.c:
-	$(PERL) -MExtUtils::Embed -e xsinit -- -o perlxsi.c
+	$(PERL) -MExtUtils::Embed -e xsinit -- -o mcast/perlxsi.c
 
 clean-data-local:
 	rm -f *.o *.so *~

src/mod/endpoints/mod_verto/mcast/MCAST.i

@@ -1,3 +1,13 @@
+%begin %{
+#ifdef __clang_analyzer__
+#include <string.h>
+static int mystrcmp (const char *a, const char *b) {
+    return a == b ? 0 : !a ? -1 : !b ? 1 : strcmp(a, b);
+}
+#define strcmp mystrcmp
+#endif
+%}
+
 %{
 #include "mcast.h"
 #include "mcast_cpp.h"

src/mod/endpoints/mod_verto/mcast/MCAST.pm

@@ -1,16 +1,16 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.35
+# Version 3.0.12
 #
-# Don't modify this file, modify the SWIG interface instead.
+# Do not make changes to this file unless you know what you are doing--modify
+# the SWIG interface file instead.
 
 package MCAST;
-require Exporter;
+use base qw(Exporter);
-require DynaLoader;
+use base qw(DynaLoader);
-@ISA = qw(Exporter DynaLoader);
 package MCASTc;
 bootstrap MCAST;
 package MCAST;
-@EXPORT = qw( );
+@EXPORT = qw();
 
 # ---------- BASE METHODS -------------
 

src/mod/endpoints/mod_verto/mcast/perlxsi.c

@@ -1,5 +1,6 @@
-#include <EXTERN.h>
+#include "EXTERN.h"
-#include <perl.h>
+#include "perl.h"
+#include "XSUB.h"
 
 EXTERN_C void xs_init (pTHX);
 
@@ -8,9 +9,10 @@ EXTERN_C void boot_DynaLoader (pTHX_ CV* cv);
 EXTERN_C void
 xs_init(pTHX)
 {
-	char *file = __FILE__;
+    static const char file[] = __FILE__;
-	dXSUB_SYS;
+    dXSUB_SYS;
+    PERL_UNUSED_CONTEXT;
 
-	/* DynaLoader is a special case */
+    /* DynaLoader is a special case */
-	newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
+    newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
 }