diff options
| author | Steve Murphy <murf@digium.com> | 2007-07-17 19:40:29 +0000 |
|---|---|---|
| committer | Steve Murphy <murf@digium.com> | 2007-07-17 19:40:29 +0000 |
| commit | 8a7732f0671ebbf091dc66ac73b81163486436df (patch) | |
| tree | 7e225066fa0140f45cb6f8338bcade84fdc30ec1 /main | |
| parent | dfc9970e1530a83e66fac08ad0b4eb262457cbf3 (diff) | |
via 10206, I have added an option (e) to Dial to allow the h exten to get run on peer. Had to upgrade ast_flag stuff to 64 bits to do this.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75400 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 2 | ||||
| -rw-r--r-- | main/loader.c | 4 | ||||
| -rw-r--r-- | main/rtp.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/main/channel.c b/main/channel.c index 105dc030e..be1b293fa 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2454,7 +2454,7 @@ done: int ast_internal_timing_enabled(struct ast_channel *chan) { int ret = ast_opt_internal_timing && chan->timingfd > -1; - ast_debug(5, "Internal timing is %s (option_internal_timing=%d chan->timingfd=%d)\n", ret? "enabled": "disabled", ast_opt_internal_timing, chan->timingfd); + ast_debug(5, "Internal timing is %s (option_internal_timing=%lld chan->timingfd=%d)\n", ret? "enabled": "disabled", ast_opt_internal_timing, chan->timingfd); return ret; } diff --git a/main/loader.c b/main/loader.c index 5f29fc6b9..20227b59e 100644 --- a/main/loader.c +++ b/main/loader.c @@ -86,8 +86,8 @@ struct ast_module { int usecount; /* the number of 'users' currently in this module */ struct module_user_list users; /* the list of users in the module */ struct { - unsigned int running:1; - unsigned int declined:1; + uint64_t running:1; + uint64_t declined:1; } flags; AST_LIST_ENTRY(ast_module) entry; char resource[0]; diff --git a/main/rtp.c b/main/rtp.c index 8aa86a613..0cba1a984 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -152,7 +152,7 @@ struct ast_rtp { int send_payload; int send_duration; int nat; - unsigned int flags; + uint64_t flags; struct sockaddr_in us; /*!< Socket representation of the local endpoint. */ struct sockaddr_in them; /*!< Socket representation of the remote endpoint. */ struct timeval rxcore; @@ -845,7 +845,7 @@ static struct ast_frame *process_cisco_dtmf(struct ast_rtp *rtp, unsigned char * char resp = 0; struct ast_frame *f = NULL; unsigned char seq; - unsigned int flags; + uint64_t flags; unsigned int power; /* We should have at least 4 bytes in RTP data */ @@ -888,7 +888,7 @@ static struct ast_frame *process_cisco_dtmf(struct ast_rtp *rtp, unsigned char * event = data[3] & 0x1f; if (option_debug > 2 || rtpdebug) - ast_debug(0, "Cisco DTMF Digit: %02x (len=%d, seq=%d, flags=%02x, power=%d, history count=%d)\n", event, len, seq, flags, power, (len - 4) / 2); + ast_debug(0, "Cisco DTMF Digit: %02x (len=%d, seq=%d, flags=%02llx, power=%d, history count=%d)\n", event, len, seq, flags, power, (len - 4) / 2); if (event < 10) { resp = '0' + event; } else if (event < 11) { |