summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--INSTALL2
-rw-r--r--Makefile8
-rw-r--r--README46
-rw-r--r--TODO22
-rw-r--r--VERSIONS2
-rw-r--r--configs/astmanproxy.conf2
-rw-r--r--src/astmanproxy.c8
-rw-r--r--src/common.c2
-rw-r--r--src/config.c2
-rw-r--r--src/config_perms.c2
-rw-r--r--src/csv.c2
-rw-r--r--src/http.c2
-rw-r--r--src/include/ssl.h2
-rw-r--r--src/log.c2
-rw-r--r--src/proxyfunc.c2
-rw-r--r--src/ssl.c2
-rw-r--r--src/standard.c2
-rw-r--r--src/xml.c2
18 files changed, 43 insertions, 69 deletions
diff --git a/INSTALL b/INSTALL
index 1842a67..ec882d8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -24,4 +24,4 @@ Please read README and docs/README.* for info on specific modules.
Enjoy!
--------------------------------------------
-(C) 2005-2006 David C. Troy, dave@popvox.com
+(C) 2005-2008 David C. Troy, dave@popvox.com
diff --git a/Makefile b/Makefile
index 05c2e10..7627d50 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
OSARCH=$(shell uname -s)
OSREV=$(shell uname -r)
-VERSION := 1.21
+VERSION := 1.22pre
DESTDIR ?=
CONFDIR:=/etc/asterisk
CONFDIR_REAL := $(DESTDIR)/etc/asterisk
@@ -73,8 +73,8 @@ VPATH = src
# For printing only
-SRCS := $(MODS:%=%.c)
-HDRS := astmanproxy.h
+SRCS := $(MODS:%=src/%.c)
+HDRS := src/include/astmanproxy.h
all: astmanproxy cert
@@ -159,7 +159,7 @@ uninstall:
dist: clean
rm -rf /tmp/astmanproxy-${VERSION}*; \
- svn export . /tmp/astmanproxy-${VERSION}; \
+ cp -R . /tmp/astmanproxy-${VERSION}; \
cd /tmp; tar czf /tmp/astmanproxy-${VERSION}-`date +%Y%m%d-%H%M`.tgz astmanproxy-${VERSION}; \
/usr/bin/scp /tmp/astmanproxy-${VERSION}-*.tgz root@www.popvox.com:$(DISTDIR); \
/usr/bin/ssh -lroot www.popvox.com "ln -sf $(DISTDIR)/astmanproxy-${VERSION}-*.tgz $(DISTDIR)/astmanproxy-latest.tgz"
diff --git a/README b/README
index 424e628..251540a 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
astmanproxy README
-(c) 2005-2006 David C. Troy, dave@popvox.com
+(c) 2005-2008 David C. Troy, dave@popvox.com
------------------------------------------------------------------
FOREWORD & QUICK START
@@ -62,7 +62,7 @@ Please send your feedback! We are looking for contributors to add
support for new I/O formats and add new features!
Contributions:
- Paypal via dave@toad.net; beer accepted at Astricon events
+ Paypal via dave@popvox.com; beer accepted at Astricon events
===================================================================
Additional Proxy Features
@@ -300,43 +300,13 @@ into Asterisk (even multiple boxes!) with no web servers needed.
===================================================================
Software Updates, Author Info, and How to Contribute
-Digium has graciously agreed to host the development of AstManProxy
-on their Subversion Community Server.
+Current development on AstManProxy is happening here:
+http://github.com/davetroy/astmanproxy/tree/master
-Latest releases can be found here:
-http://svncommunity.digium.com/view/astmanproxy
+Please feel free to fork and contribute!
-For development branches & experimental features:
-http://svncommunity.digium.com/view/astmanproxy/branches
-
-For current development/stable snapshot:
-http://svncommunity.digium.com/view/astmanproxy/trunk
-
-For stable release versions:
-http://svncommunity.digium.com/view/astmanproxy/tags
-
-To download from these repositories:
-
- - Install Subversion (yum -y install subversion -- or equivalent)
- - svn checkout http://svncommunity.digium.com/svn/astmanproxy/trunk
-
-Be sure to use the full URL path to the version you wish to check out;
-for example, do not checkout the 'branches' tree, but instead choose
-which branch to checkout, as in:
-
-http://svncommunity.digium.com/svn/astmanproxy/branches/1.2x
-
-I will also try to post current tarballs here:
-http://www.popvox.com/astmanproxy
-
-Donations are accepted via paypal to dave@toad.net; beer is also
-accepted at Astricon events. :)
-
-To contact me about contributing to the project, please email:
-dave@popvox.com
-
-I acknowledge all contributions and encourage your experimentation!
-AstManProxy would not be where it is without your support!!
+Also, there is a new mailing list / group available here:
+http://groups.google.com/?hl=en
===================================================================
AstManProxy Background Information
@@ -381,4 +351,4 @@ and output format -- implemented as abstracted I/O handlers -- and
these are configurable on a per-client basis.
===================================================================
-(C) 2005-2006 David C. Troy, dave@popvox.com
+(C) 2005-2008 David C. Troy, dave@popvox.com
diff --git a/TODO b/TODO
index 839aa55..c46bfad 100644
--- a/TODO
+++ b/TODO
@@ -1,11 +1,13 @@
-trap action=command in xml.c; remove arbitrary detection of unparsed data
-write SOAP methods for http.c to use
-clean up reconnect to lost asterisk server (socket reuse)
-clean up debugmsg instances to add if (debug)
-deal with http non-conformity better, and act on POST MIME-type inputs
+Some suggestions for features:
+ trap action=command in xml.c; remove arbitrary detection of unparsed data
+ write SOAP methods for http.c to use
+ clean up reconnect to lost asterisk server (socket reuse)
+ clean up debugmsg instances to add if (debug)
+ deal with http non-conformity better, and act on POST MIME-type inputs
+ State maintenance modules
-Check for module versions; do not run without modules installed
-State maintenance modules
-tcpwrappers/access control/connect mask?
-libtool/autoconf/automake support
-SetInputFormat proxyaction?
+Some infrastructure ideas:
+ Check for module versions; do not run without modules installed
+ tcpwrappers/access control/connect mask?
+ libtool/autoconf/automake support
+ SetInputFormat proxyaction?
diff --git a/VERSIONS b/VERSIONS
index 05825d7..86df451 100644
--- a/VERSIONS
+++ b/VERSIONS
@@ -1,3 +1,5 @@
+1.22pre current trunk
+
1.21 Major code formatting cleanup and official release of 1.21pre (trunk)
Documentation overhaul & cleanup
diff --git a/configs/astmanproxy.conf b/configs/astmanproxy.conf
index 5c2f480..6e98dab 100644
--- a/configs/astmanproxy.conf
+++ b/configs/astmanproxy.conf
@@ -1,6 +1,6 @@
; astmanproxy.conf
; Asterisk Manager Proxy Configuration Sample
-; (C) 2005-2006 David C. Troy - dave@popvox.com
+; (C) 2005-2008 David C. Troy - dave@popvox.com
; List of asterisk host(s) you want to proxy
; host = ip_addr, port, user, secret, events, use_ssl
diff --git a/src/astmanproxy.c b/src/astmanproxy.c
index 59ec99f..5a61723 100644
--- a/src/astmanproxy.c
+++ b/src/astmanproxy.c
@@ -1,5 +1,5 @@
/* Asterisk Manager Proxy
- Copyright (c) 2005-2006 David C. Troy <dave@popvox.com>
+ Copyright (c) 2005-2008 David C. Troy <dave@popvox.com>
This program is free software, distributed under the terms of
the GNU General Public License.
@@ -123,7 +123,7 @@ void leave(int sig) {
void Version( void )
{
- printf("astmanproxy: Version %s, (C) David C. Troy 2005-2006\n", PROXY_VERSION);
+ printf("astmanproxy: Version %s, (C) David C. Troy 2005-2008\n", PROXY_VERSION);
return;
}
@@ -646,8 +646,8 @@ int main(int argc, char *argv[])
debugmsg("loaded handlers");
if (SetProcUID()) {
- fprintf(stderr,"Cannot set user/group! Check proc_user and proc_group config setting!\n");
- exit(1);
+ fprintf(stderr,"Cannot set user/group! Check proc_user and proc_group config setting!\n");
+ exit(1);
}
/* If we are not in debug mode, then fork to background */
diff --git a/src/common.c b/src/common.c
index b87d564..793f757 100644
--- a/src/common.c
+++ b/src/common.c
@@ -1,5 +1,5 @@
/* Asterisk Manager Proxy
- Copyright (c) 2005-2006 David C. Troy <dave@popvox.com>
+ Copyright (c) 2005-2008 David C. Troy <dave@popvox.com>
This program is free software, distributed under the terms of
the GNU General Public License.
diff --git a/src/config.c b/src/config.c
index 4a9ce2b..fa11e34 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1,5 +1,5 @@
/* Asterisk Manager Proxy
- Copyright (c) 2005-2006 David C. Troy <dave@popvox.com>
+ Copyright (c) 2005-2008 David C. Troy <dave@popvox.com>
This program is free software, distributed under the terms of
the GNU General Public License.
diff --git a/src/config_perms.c b/src/config_perms.c
index 647e36b..0d42af5 100644
--- a/src/config_perms.c
+++ b/src/config_perms.c
@@ -1,5 +1,5 @@
/* Asterisk Manager Proxy
- Copyright (c) 2005-2006 David C. Troy <dave@popvox.com>
+ Copyright (c) 2005-2008 David C. Troy <dave@popvox.com>
This program is free software, distributed under the terms of
the GNU General Public License.
diff --git a/src/csv.c b/src/csv.c
index bcd9a88..1c32a65 100644
--- a/src/csv.c
+++ b/src/csv.c
@@ -1,5 +1,5 @@
/* Asterisk Manager Proxy
- Copyright (c) 2005-2006 David C. Troy <dave@popvox.com>
+ Copyright (c) 2005-2008 David C. Troy <dave@popvox.com>
This program is free software, distributed under the terms of
the GNU General Public License.
diff --git a/src/http.c b/src/http.c
index 3dc874f..9b2e76a 100644
--- a/src/http.c
+++ b/src/http.c
@@ -1,5 +1,5 @@
/* Asterisk Manager Proxy
- Copyright (c) 2005-2006 David C. Troy <dave@popvox.com>
+ Copyright (c) 2005-2008 David C. Troy <dave@popvox.com>
This program is free software, distributed under the terms of
the GNU General Public License.
diff --git a/src/include/ssl.h b/src/include/ssl.h
index 123bd43..32132ff 100644
--- a/src/include/ssl.h
+++ b/src/include/ssl.h
@@ -2,7 +2,7 @@
* ssl_addon: Encrypts the asterisk management interface
*
* Copyrights:
- * Copyright (C) 2005-2006, Tello Corporation, Inc.
+ * Copyright (C) 2005-2008, Tello Corporation, Inc.
*
* Contributors:
* Remco Treffkorn(Architect) and Mahesh Karoshi
diff --git a/src/log.c b/src/log.c
index fc86643..9570356 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1,5 +1,5 @@
/* Asterisk Manager Proxy
- Copyright (c) 2005-2006 David C. Troy <dave@popvox.com>
+ Copyright (c) 2005-2008 David C. Troy <dave@popvox.com>
This program is free software, distributed under the terms of
the GNU General Public License.
diff --git a/src/proxyfunc.c b/src/proxyfunc.c
index 484da78..857c421 100644
--- a/src/proxyfunc.c
+++ b/src/proxyfunc.c
@@ -1,5 +1,5 @@
/* Asterisk Manager Proxy
- Copyright (c) 2005-2006 David C. Troy <dave@popvox.com>
+ Copyright (c) 2005-2008 David C. Troy <dave@popvox.com>
This program is free software, distributed under the terms of
the GNU General Public License.
diff --git a/src/ssl.c b/src/ssl.c
index 40115b1..80ca467 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -1,7 +1,7 @@
/*
* Asterisk -- An open source telephony toolkit.
*
- * Copyright (C) 2006, Tello Corporation, Inc.
+ * Copyright (C) 2008, Tello Corporation, Inc.
*
* Remco Treffkorn(Architect) and Mahesh Karoshi(Senior Software Developer)
*
diff --git a/src/standard.c b/src/standard.c
index f377bec..d03ef6f 100644
--- a/src/standard.c
+++ b/src/standard.c
@@ -1,5 +1,5 @@
/* Asterisk Manager Proxy
- Copyright (c) 2005-2006 David C. Troy <dave@popvox.com>
+ Copyright (c) 2005-2008 David C. Troy <dave@popvox.com>
This program is free software, distributed under the terms of
the GNU General Public License.
diff --git a/src/xml.c b/src/xml.c
index f068b73..e4cae8f 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -1,5 +1,5 @@
/* Asterisk Manager Proxy
- Copyright (c) 2005-2006 David C. Troy <dave@popvox.com>
+ Copyright (c) 2005-2008 David C. Troy <dave@popvox.com>
This program is free software, distributed under the terms of
the GNU General Public License.