kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-18 15:49:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't redefine the localuser struct for additional use specific to the module (issue #6216)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8742 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-01-26 20:28:52 +00:00
parent 09e357e013
commit 32026d6f49
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apps/app_dial.c
View File

@@ -262,19 +262,20 @@ AST_APP_OPTIONS(dial_exec_options, {
use it not only for keeping track of what is in use but use it not only for keeping track of what is in use but
also for keeping track of who we're dialing. */ also for keeping track of who we're dialing. */
struct localuser { struct dial_localuser {
struct ast_channel *chan; struct ast_channel *chan;
unsigned int flags; unsigned int flags;
int forwards; int forwards;
struct localuser *next; struct dial_localuser *next;
}; };
LOCAL_USER_DECL; LOCAL_USER_DECL;
STANDARD_LOCAL_USER;
static void hanguptree(struct localuser *outgoing, struct ast_channel *exception) static void hanguptree(struct dial_localuser *outgoing, struct ast_channel *exception)
{ {
/* Hang up a tree of stuff */ /* Hang up a tree of stuff */
struct localuser *oo; struct dial_localuser *oo;
while (outgoing) { while (outgoing) {
/* Hangup any existing lines we have open */ /* Hangup any existing lines we have open */
if (outgoing->chan && (outgoing->chan != exception)) if (outgoing->chan && (outgoing->chan != exception))
@@ -366,9 +367,9 @@ static void senddialevent(struct ast_channel *src, struct ast_channel *dst)
dst->uniqueid); dst->uniqueid);
} }
static struct ast_channel *wait_for_answer(struct ast_channel *in, struct localuser *outgoing, int *to, struct ast_flags *peerflags, int *sentringing, char *status, size_t statussize, int busystart, int nochanstart, int congestionstart, int priority_jump, int *result) static struct ast_channel *wait_for_answer(struct ast_channel *in, struct dial_localuser *outgoing, int *to, struct ast_flags *peerflags, int *sentringing, char *status, size_t statussize, int busystart, int nochanstart, int congestionstart, int priority_jump, int *result)
{ {
struct localuser *o; struct dial_localuser *o;
int found; int found;
int numlines; int numlines;
int numbusy = busystart; int numbusy = busystart;
@@ -736,7 +737,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
char *tech, *number, *rest, *cur; char *tech, *number, *rest, *cur;
char privcid[256]; char privcid[256];
char privintro[1024]; char privintro[1024];
struct localuser *outgoing=NULL, *tmp; struct dial_localuser *outgoing=NULL, *tmp;
struct ast_channel *peer; struct ast_channel *peer;
int to; int to;
int numbusy = 0; int numbusy = 0;