diff options
| author | Steve Murphy <murf@digium.com> | 2007-07-19 23:24:27 +0000 |
|---|---|---|
| committer | Steve Murphy <murf@digium.com> | 2007-07-19 23:24:27 +0000 |
| commit | 0e969271ae14e976b873327bd721eba24947545a (patch) | |
| tree | b7dc4ff6bdbb84391b8b226995daa5bb8fbde8b9 /main/rtp.c | |
| parent | 7756ba661904d1147e42ce884d3ebb2f128233b5 (diff) | |
After some study, thought, comparing, etc. I've backed out the previous universal mod to make ast_flags a 64 bit thing. Instead, I added a 64-bit version of ast_flags (ast_flags64), and 64-bit versions of the test-flag, set-flag, etc. macros, and an app_parse_options64 routine, and I use these in app_dial alone, to eliminate the 30-option limit it had grown to meet. There is room now for 32 more options and flags. I was heavily tempted to implement some of the other ideas that were presented, but this solution does not intro any new versions of dial, doesn't have a different API, has a minimal/zero impact on code outside of dial, and doesn't seriously (I hope) affect the code structure of dial. It's the best I can think of right now. My goal was NOT to rewrite dial. I leave that to a future, coordinated effort.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75983 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/rtp.c')
| -rw-r--r-- | main/rtp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/rtp.c b/main/rtp.c index 403e5ea0a..8aa86a613 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -152,7 +152,7 @@ struct ast_rtp { int send_payload; int send_duration; int nat; - uint64_t flags; + unsigned int 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; - uint64_t flags; + unsigned int 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=%02llx, power=%d, history count=%d)\n", event, len, seq, (unsigned long long)flags, power, (len - 4) / 2); + 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); if (event < 10) { resp = '0' + event; } else if (event < 11) { |