diff options
author | David Troy <dave@popvox.com> | 2006-04-07 17:27:01 +0000 |
---|---|---|
committer | David Troy <dave@popvox.com> | 2006-04-07 17:27:01 +0000 |
commit | 2e59afd9c5cdfcc8fa3f7237668568e9c85a15a0 (patch) | |
tree | 77dbd25294aeaf722a2573921308b9b05be9e896 | |
parent | 524502c0a8d5b6d8ec1f15ab456b20c1d33451ad (diff) | |
download | astmanproxy-2e59afd9c5cdfcc8fa3f7237668568e9c85a15a0.tar.gz astmanproxy-2e59afd9c5cdfcc8fa3f7237668568e9c85a15a0.tar.xz astmanproxy-2e59afd9c5cdfcc8fa3f7237668568e9c85a15a0.zip |
git-svn-id: http://svncommunity.digium.com/svn/astmanproxy/branches/1.20pre@92 f02b47b9-160a-0410-81a6-dc3441afb0ec
-rw-r--r-- | INSTALL | 18 | ||||
-rw-r--r-- | TODO | 5 | ||||
-rw-r--r-- | VERSIONS | 3 | ||||
-rw-r--r-- | src/astmanproxy.c | 2 | ||||
-rw-r--r-- | src/config.c | 6 | ||||
-rw-r--r-- | src/csv.c | 3 | ||||
-rw-r--r-- | src/http.c | 4 | ||||
-rw-r--r-- | src/include/astmanproxy.h | 1 | ||||
-rw-r--r-- | src/standard.c | 3 | ||||
-rw-r--r-- | src/xml.c | 5 |
10 files changed, 22 insertions, 28 deletions
@@ -1,13 +1,27 @@ Quick Install Instructions -------------------------- -It's easy: +Requirements: openssl, openssl-devel + +Installation is easy: 1. make 2. make install -3. run: +3. To run: astmanproxy -d (for debug mode) +astmanproxy -dddddd (for more debug info) astmanproxy (for background mode) +Other make actions: + +make cert Makes initial proxy server certificate +make certificate Forces remake of proxy server certificate) +make clean Remove all binary object files from source tree + +Please read README and docs/README.* for info on specific modules. + Enjoy! + +-------------------------------------------- +(C) 2005-2006 David C. Troy, dave@popvox.com @@ -1,8 +1,7 @@ -fix non-blocking in ast_connect -fix reconnect to lost asterisk server (socket reuse) check s->connect construct -kill autodisconnect concept; this would be managed by inputcomplete/outputcomplete in drivers? finish SOAP handler +clean up reconnect to lost asterisk server (socket reuse) +clean up debugmsg instances to add if (debug) 'connected' flag; do not set until we get "authentication accepted' back from server Check for module versions; do not run without modules installed @@ -1,4 +1,4 @@ -1.20pre Now using ast_carefulwrite for non-blocking writes +1.20pre Now using ast_carefulwrite for non-blocking writes to all sockets Added asteriskwritetimeout config setting for asterisk write timeout Added clientwritetimeout config setting for client write timeout Added support for astmanproxy.users user authentication (Steve Davies) @@ -7,6 +7,7 @@ Added writetimeout var to mansession structure for use by ast_carefulwrite Added SSL Support (Remco Treffkorn, Mahesh Karoshi, John Todd; Tello Corp) Added 'usessl' option for connecting to asterisk servers + Fixed proxykey pointer bug (Steve Davies) ------------------------------------------------------------------------------------------------ 1.1pre2 Completely Modularized and Abstracted Input/Output formats diff --git a/src/astmanproxy.c b/src/astmanproxy.c index 0cc3a6a..9eb5ac6 100644 --- a/src/astmanproxy.c +++ b/src/astmanproxy.c @@ -266,7 +266,7 @@ void *session_do(struct mansession *s) if (res > 0) { /* Check for anything that requires proxy-side processing */ - if (pc.key && !s->authenticated) { + if (pc.key[0] != '\0' && !s->authenticated) { key = astman_get_header(&m, "ProxyKey"); if (!strcmp(key, pc.key) ) { pthread_mutex_lock(&s->lock); diff --git a/src/config.c b/src/config.c index b7bbdc7..c8c9d80 100644 --- a/src/config.c +++ b/src/config.c @@ -190,11 +190,7 @@ int LoadHandlers() { io->write = wh; if (och) io->onconnect = och; - io->autodisconnect = dlsym(dlhandle, "_autodisconnect"); - if ((error = dlerror()) != NULL) { - if (debug) - debugmsg("loading: note, %s_autodisconnect not defined; ignoring", fmt); - } + io->dlhandle = dlhandle; io->next = iohandlers; iohandlers = io; @@ -28,6 +28,3 @@ int _write(struct mansession *s, struct message *m) { return 0; } -int _autodisconnect() { - return 0; -} @@ -152,8 +152,4 @@ int _read(struct mansession *s, struct message *m) { return -1; } -int _autodisconnect() { - return 1; -} - /* We do not define a _write or _onconnect method */ diff --git a/src/include/astmanproxy.h b/src/include/astmanproxy.h index a8cb26b..db370dc 100644 --- a/src/include/astmanproxy.h +++ b/src/include/astmanproxy.h @@ -80,7 +80,6 @@ struct iohandler { int (*read) (); int (*write) (); int (*onconnect) (); - int *(*autodisconnect)(void); char formatname[80]; void *dlhandle; struct iohandler *next; diff --git a/src/standard.c b/src/standard.c index 0b2bd17..9e8f200 100644 --- a/src/standard.c +++ b/src/standard.c @@ -68,6 +68,3 @@ int _onconnect(struct mansession *s, struct message *m) { return 0; } -int _autodisconnect() { - return 0; -} @@ -98,11 +98,6 @@ int _write(struct mansession *s, struct message *m) { return 0; } -int _autodisconnect() { - return 0; -} - - /* Takes a single manager header line and converts xml entities */ void xml_quote_string(char *s, char *o) { |