kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge russell's flag macro patch (with slight mods) (bug #3046)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4469 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-12-16 03:15:20 +00:00
parent da6073e8c6
commit cadb8d010b
5 changed files with 13 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app_dial.c
View File

@@ -914,7 +914,7 @@ static int dial_exec(struct ast_channel *chan, void *data)
/* Presense of ADSI CPE on outgoing channel follows ours */
tmp->chan->adsicpe = chan->adsicpe;
/* pass the digital flag */
ast_dup_flag(tmp->chan, chan, AST_FLAG_DIGITAL);
ast_copy_flags(tmp->chan, chan, AST_FLAG_DIGITAL);
/* If we have an outbound group, set this peer channel to it */
if (outbound_group)

13
channels/chan_agent.c
View File

@@ -354,19 +354,6 @@ static struct ast_frame *agent_read(struct ast_channel *ast)
p->acknowledged = 0;
}
}
#if 0
/* I don't know what this code does and was unable to get a hold of Jim to
find out, but it causes chan_agent to crash (see bug #3043) at
http://bugs.digium.com */
if ((!strncmp(p->chan->name,"Zap",3)) && (!p->ackcall) && (!p->acknowledged))
{
p->acknowledged = 1;
f = &answer_frame;
if (p->chan)
p->chan->_bridge = ast;
}
#endif
if (f && (f->frametype == AST_FRAME_CONTROL) && (f->subclass == AST_CONTROL_ANSWER)) {
/* TC */
if (p->ackcall) {

37
include/asterisk/channel.h
View File

@@ -231,43 +231,6 @@ struct ast_channel {
#define AST_FLAG_ZOMBIE (1 << 4) /* if we are a zombie */
#define AST_FLAG_EXCEPTION (1 << 5) /* if there is a pending exception */
static inline int ast_test_flag(struct ast_channel *chan, int mode)
{
return chan->flags & mode;
}
static inline void ast_set_flag(struct ast_channel *chan, int mode)
{
chan->flags |= mode;
}
static inline void ast_clear_flag(struct ast_channel *chan, int mode)
{
chan->flags &= ~mode;
}
static inline void ast_copy_flags(struct ast_channel *dest, struct ast_channel *src, int flags)
{
dest->flags &= ~flags;
dest->flags |= (src->flags & flags);
}
static inline void ast_set2_flag(struct ast_channel *chan, int value, int mode)
{
if (value)
ast_set_flag(chan, mode);
else
ast_clear_flag(chan, mode);
}
static inline void ast_dup_flag(struct ast_channel *dstchan, struct ast_channel *srcchan, int mode)
{
if (ast_test_flag(srcchan, mode))
ast_set_flag(dstchan, mode);
else
ast_clear_flag(dstchan, mode);
}
struct ast_bridge_config {
int play_to_caller;
int play_to_callee;

11
include/asterisk/utils.h
View File

@@ -17,6 +17,17 @@
#include <pthread.h>
#include <asterisk/lock.h>
#define ast_test_flag(p,flag) ((p)->flags & (flag))
#define ast_set_flag(p,flag) ((p)->flags |= (flag))
#define ast_clear_flag(p,flag) ((p)->flags &= ~(flag))
#define ast_copy_flags(dest,src,flagz) do { dest->flags &= ~(flagz); \
dest->flags |= (src->flags & flagz); } while(0)
#define ast_set2_flag(p,value,flag) ((value) ? ast_set_flag(p,flag) : ast_clear_flag(p,flag))
static inline int ast_strlen_zero(const char *s)
{
return (*s == '\0');

1
indications.c
View File

@@ -26,6 +26,7 @@
#include <asterisk/channel.h>
#include <asterisk/logger.h>
#include <asterisk/lock.h>
#include <asterisk/utils.h>
struct playtones_item {
int freq1;