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 /channels/chan_iax2.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 'channels/chan_iax2.c')
| -rw-r--r-- | channels/chan_iax2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 23ef72958..05c23067d 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -315,7 +315,7 @@ struct iax2_user { int encmethods; int amaflags; int adsi; - uint64_t flags; + unsigned int flags; int capability; int maxauthreq; /*!< Maximum allowed outstanding AUTHREQs */ int curauthreq; /*!< Current number of outstanding AUTHREQs */ @@ -353,7 +353,7 @@ struct iax2_peer { int sockfd; /*!< Socket to use for transmission */ struct in_addr mask; int adsi; - uint64_t flags; + unsigned int flags; /* Dynamic Registration fields */ struct sockaddr_in defaddr; /*!< Default address if there is one */ @@ -604,7 +604,7 @@ struct chan_iax2_pvt { /*! Associated peer for poking */ struct iax2_peer *peerpoke; /*! IAX_ flags */ - uint64_t flags; + unsigned int flags; int adsi; /*! Transferring status */ @@ -2807,7 +2807,7 @@ static void realtime_update_peer(const char *peername, struct sockaddr_in *sin, struct create_addr_info { int capability; - uint64_t flags; + unsigned int flags; int maxtime; int encmethods; int found; |