ben.carrasco/freeswitch
1
0 Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-11-14 05:18:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3662 d0543943-73ff-0310-b7d9-9358b9ac24b2

Browse Source
This commit is contained in:
Michael Jerris committed 2006-12-14 22:47:33 +00:00
1 parent 933e30dd96
commit 70996f09eb
24 files changed
+4349 -2661
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

libs/iax/src/Makefile.am
+7 -16
View File
@@ -1,24 +1,15 @@
AM_CFLAGS = -Wall -O2
AM_CFLAGS += -g -Wall -Wstrict-prototypes -I .
AM_CFLAGS = $(new_AM_CFLAGS)
AM_CPPFLAGS = $(AM_CFLAGS)
AM_LDFLAGS = $(new_AM_LDFLAGS)
AM_CFLAGS += -DDEBUG_SUPPORT -DLIBIAX
AM_CFLAGS += -fsigned-char
# -DDEBUG_DEFAULT
AM_CFLAGS += $(UCFLAGS)
if ISMAC
AM_CFLAGS += -DMACOSX
endif
pkgdir = $(libdir)
pkg_LTLIBRARIES=libiax.la
libiax_la_SOURCES = iax2-parser.c iax.c md5.c jitterbuf.c
EXTRA_DIST = md5.h frame.h iax-client.h iax2.h iax2-parser.h jitterbuf.h
install-data-local:
mkdir -p $(includedir)/iax
install -m 644 md5.h $(includedir)/iax
install -m 644 frame.h $(includedir)/iax
install -m 644 iax.h $(includedir)/iax
install -m 644 iax2.h $(includedir)/iax
install -m 644 iax2-parser.h $(includedir)/iax
install -m 644 iax-client.h $(includedir)/iax
library_includedir = $(prefix)/include/iax
library_include_HEADERS = md5.h frame.h iax-client.h iax2.h iax2-parser.h iax.h
noinst_HEADERS = jitterbuf.h
libs/iax/src/Makefile.in
+60 -32
View File
@@ -14,6 +14,7 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -36,11 +37,18 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@ISMAC_TRUE@am__append_1 = -DMACOSX
subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
DIST_COMMON = $(library_include_HEADERS) $(noinst_HEADERS) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__aclocal_m4_deps = \
$(top_srcdir)/build/config/ax_compiler_vendor.m4 \
$(top_srcdir)/build/config/ax_cflags_warn_all_ansi.m4 \
$(top_srcdir)/build/config/ax_cc_maxopt.m4 \
$(top_srcdir)/build/config/ax_check_compiler_flags.m4 \
$(top_srcdir)/build/config/ac_gcc_archflag.m4 \
$(top_srcdir)/build/config/ac_gcc_x86_cpuid.m4 \
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -51,14 +59,15 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(pkgdir)"
am__installdirs = "$(DESTDIR)$(pkgdir)" \
"$(DESTDIR)$(library_includedir)"
pkgLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(pkg_LTLIBRARIES)
libiax_la_LIBADD =
am_libiax_la_OBJECTS = iax2-parser.lo iax.lo md5.lo jitterbuf.lo
libiax_la_OBJECTS = $(am_libiax_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
depcomp = $(SHELL) $(top_srcdir)/build/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -70,6 +79,8 @@ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libiax_la_SOURCES)
DIST_SOURCES = $(libiax_la_SOURCES)
library_includeHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(library_include_HEADERS) $(noinst_HEADERS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -94,6 +105,7 @@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -107,8 +119,6 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
ISMAC_FALSE = @ISMAC_FALSE@
ISMAC_TRUE = @ISMAC_TRUE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -124,11 +134,15 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PRTDIAG = @PRTDIAG@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SOLINK = @SOLINK@
STRIP = @STRIP@
VERSION = @VERSION@
WANT_DEBUG_FALSE = @WANT_DEBUG_FALSE@
WANT_DEBUG_TRUE = @WANT_DEBUG_TRUE@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -165,6 +179,8 @@ libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
new_AM_CFLAGS = @new_AM_CFLAGS@
new_AM_LDFLAGS = @new_AM_LDFLAGS@
oldincludedir = @oldincludedir@
prefix = @prefix@
program_transform_name = @program_transform_name@
@@ -173,13 +189,15 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
# -DDEBUG_DEFAULT
AM_CFLAGS = -Wall -O2 -g -Wall -Wstrict-prototypes -I . \
-DDEBUG_SUPPORT -DLIBIAX -fsigned-char $(UCFLAGS) \
$(am__append_1)
AM_CFLAGS = $(new_AM_CFLAGS) -DDEBUG_SUPPORT -DLIBIAX $(UCFLAGS)
AM_CPPFLAGS = $(AM_CFLAGS)
AM_LDFLAGS = $(new_AM_LDFLAGS)
pkgdir = $(libdir)
pkg_LTLIBRARIES = libiax.la
libiax_la_SOURCES = iax2-parser.c iax.c md5.c jitterbuf.c
EXTRA_DIST = md5.h frame.h iax-client.h iax2.h iax2-parser.h jitterbuf.h
library_includedir = $(prefix)/include/iax
library_include_HEADERS = md5.h frame.h iax-client.h iax2.h iax2-parser.h iax.h
noinst_HEADERS = jitterbuf.h
all: all-am
.SUFFIXES:
@@ -284,6 +302,23 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
uninstall-info-am:
install-library_includeHEADERS: $(library_include_HEADERS)
@$(NORMAL_INSTALL)
test -z "$(library_includedir)" || $(mkdir_p) "$(DESTDIR)$(library_includedir)"
@list='$(library_include_HEADERS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
echo " $(library_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(library_includedir)/$$f'"; \
$(library_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(library_includedir)/$$f"; \
done
uninstall-library_includeHEADERS:
@$(NORMAL_UNINSTALL)
@list='$(library_include_HEADERS)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(library_includedir)/$$f'"; \
rm -f "$(DESTDIR)$(library_includedir)/$$f"; \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -362,9 +397,9 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
all-am: Makefile $(LTLIBRARIES)
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs:
for dir in "$(DESTDIR)$(pkgdir)"; do \
for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(library_includedir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@@ -412,7 +447,7 @@ info: info-am
info-am:
install-data-am: install-data-local install-pkgLTLIBRARIES
install-data-am: install-library_includeHEADERS install-pkgLTLIBRARIES
install-exec-am:
@@ -440,30 +475,23 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-info-am uninstall-pkgLTLIBRARIES
uninstall-am: uninstall-info-am uninstall-library_includeHEADERS \
uninstall-pkgLTLIBRARIES
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool clean-pkgLTLIBRARIES ctags distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
install-data-local install-exec install-exec-am install-info \
install-info-am install-man install-pkgLTLIBRARIES \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am tags uninstall uninstall-am \
uninstall-info-am uninstall-pkgLTLIBRARIES
install install-am install-data install-data-am install-exec \
install-exec-am install-info install-info-am \
install-library_includeHEADERS install-man \
install-pkgLTLIBRARIES install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-info-am \
uninstall-library_includeHEADERS uninstall-pkgLTLIBRARIES
install-data-local:
mkdir -p $(includedir)/iax
install -m 644 md5.h $(includedir)/iax
install -m 644 frame.h $(includedir)/iax
install -m 644 iax.h $(includedir)/iax
install -m 644 iax2.h $(includedir)/iax
install -m 644 iax2-parser.h $(includedir)/iax
install -m 644 iax-client.h $(includedir)/iax
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
libs/iax/src/iax.c
+5 -26
View File
@@ -283,31 +283,10 @@ void iax_disable_debug(void)
}
/* This is a little strange, but to debug you call DEBU(G "Hello World!\n"); */
#ifdef WIN32
#define G __FILE__, __LINE__,
#else
#ifdef __GNUC__
#define G __FILE__, __LINE__, __PRETTY_FUNCTION__,
#else
#define G __FILE__, __LINE__, __func__,
#endif
#endif
#define G __FILE__, __LINE__, __FUNCTION__,
#define DEBU __debug
#ifdef WIN32
static int __debug(char *file, int lineno, char *fmt, ...)
{
va_list args;
va_start(args, fmt);
if (debug) {
fprintf(stderr, "%s line %d: ", file, lineno);
vfprintf(stderr, fmt, args);
}
va_end(args);
return 0;
}
#else
static int __debug(char *file, int lineno, char *func, char *fmt, ...)
static int __debug(char *file, int lineno, const char *func, char *fmt, ...)
{
va_list args;
va_start(args, fmt);
@@ -318,7 +297,7 @@ static int __debug(char *file, int lineno, char *func, char *fmt, ...)
va_end(args);
return 0;
}
#endif
#else /* No debug support */
#ifdef WIN32
@@ -1094,7 +1073,7 @@ static int iax_send(struct iax_session *pvt, struct ast_frame *f, time_in_ms_t t
fr->iseqno = pvt->iseqno;
fh = (struct ast_iax2_full_hdr *)(((char *)fr->af.data) - sizeof(struct ast_iax2_full_hdr));
fh->scallno = htons(fr->callno | IAX_FLAG_FULL);
fh->ts = htonl((u_long)(fr->ts));
fh->ts = htonl((long)(fr->ts));
fh->oseqno = fr->oseqno;
if (transfer) {
fh->iseqno = 0;
@@ -1135,7 +1114,7 @@ static int iax_send(struct iax_session *pvt, struct ast_frame *f, time_in_ms_t t
/* Mini frame will do */
mh = (struct ast_iax2_mini_hdr *)(((char *)fr->af.data) - sizeof(struct ast_iax2_mini_hdr));
mh->callno = htons(fr->callno);
mh->ts = htons((u_short)(fr->ts & 0xFFFF));
mh->ts = htons((short)(fr->ts & 0xFFFF));
fr->datalen = fr->af.datalen + sizeof(struct ast_iax2_mini_hdr);
fr->data = mh;
fr->retries = -1;