diff options
| author | David Troy <dave@popvox.com> | 2006-04-01 17:07:59 +0000 |
|---|---|---|
| committer | David Troy <dave@popvox.com> | 2006-04-01 17:07:59 +0000 |
| commit | aa8304c0664b780dd47cb2a662664f897a8e7c34 (patch) | |
| tree | ab83e52a5fd686cb17fb018db0666d3799798c58 | |
| parent | bbdd8a0682749bab14f511ca79c439d4681e8da3 (diff) | |
| download | astmanproxy-aa8304c0664b780dd47cb2a662664f897a8e7c34.tar.gz astmanproxy-aa8304c0664b780dd47cb2a662664f897a8e7c34.tar.xz astmanproxy-aa8304c0664b780dd47cb2a662664f897a8e7c34.zip | |
git-svn-id: http://svncommunity.digium.com/svn/astmanproxy/branches/1.20pre@39 f02b47b9-160a-0410-81a6-dc3441afb0ec
| -rw-r--r-- | src/astmanproxy.c | 3 | ||||
| -rw-r--r-- | src/proxyfunc.c | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/astmanproxy.c b/src/astmanproxy.c index 6c82594..c24fb56 100644 --- a/src/astmanproxy.c +++ b/src/astmanproxy.c @@ -18,7 +18,6 @@ extern void *proxyaction_do(char *proxyaction, struct message *m, struct mansess extern void *ProxyLogin(struct mansession *s, char* username, char* secret); extern void *ProxyLogoff(struct mansession *s); extern int ValidateAction(struct message *m, struct mansession *s, int inbound); -extern void *SendError(struct mansession *s); int ConnectAsterisk(struct mansession *s); @@ -286,7 +285,7 @@ void *session_do(struct mansession *s) if ( !WriteAsterisk(&m) ) break; } else { - SendError(s); + SendError(s, "Action Filtered"); } } else if (res < 0) break; diff --git a/src/proxyfunc.c b/src/proxyfunc.c index 51ed5c6..99d6dbc 100644 --- a/src/proxyfunc.c +++ b/src/proxyfunc.c @@ -115,9 +115,7 @@ void *ProxyLogin(struct mansession *s, char *user, char *secret) { pthread_mutex_unlock(&userslock); if( !pu ) { - AddHeader(&m, "Response: Error"); - AddHeader(&m, "Message: Authentication failed"); - s->output->write(s, &m); + SendError(s, "Authentication failed"); s->authenticated = 0; if( debug ) debugmsg("Login failed as: %s/%s", user, secret); @@ -322,12 +320,12 @@ int ValidateAction(struct message *m, struct mansession *s, int inbound) { return 1; } -void *SendError(struct mansession *s) { +void *SendError(struct mansession *s, char *errmsg) { struct message m; memset(&m, 0, sizeof(struct message)); AddHeader(&m, "Response: Error"); - AddHeader(&m, "Message: Action Filtered"); + AddHeader(&m, "Message: %s", errmsg); s->output->write(s, &m); |