diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-10-26 16:18:25 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-10-26 16:18:25 +0000 |
| commit | e12982168f72b0c6022d4a0c9d6bb476b80ed5be (patch) | |
| tree | d517982f50af327e5190efa1865642e3272e1319 | |
| parent | faf0b5b5064a9e58eae455fdc7b1ad5baca9e43d (diff) | |
use an enum instead of #define'd integers in a couple of places
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6857 f38db490-d61c-443f-a65b-d21fe96a405b
| -rwxr-xr-x | channels/chan_iax2.c | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 2e11a3744..f407e21a2 100755 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -363,19 +363,23 @@ struct iax_firmware { unsigned char *buf; }; -#define REG_STATE_UNREGISTERED 0 -#define REG_STATE_REGSENT 1 -#define REG_STATE_AUTHSENT 2 -#define REG_STATE_REGISTERED 3 -#define REG_STATE_REJECTED 4 -#define REG_STATE_TIMEOUT 5 -#define REG_STATE_NOAUTH 6 - -#define TRANSFER_NONE 0 -#define TRANSFER_BEGIN 1 -#define TRANSFER_READY 2 -#define TRANSFER_RELEASED 3 -#define TRANSFER_PASSTHROUGH 4 +enum iax_reg_state { + REG_STATE_UNREGISTERED = 0, + REG_STATE_REGSENT, + REG_STATE_AUTHSENT, + REG_STATE_REGISTERED, + REG_STATE_REJECTED, + REG_STATE_TIMEOUT, + REG_STATE_NOAUTH +}; + +enum iax_transfer_state { + TRANSFER_NONE = 0, + TRANSFER_BEGIN, + TRANSFER_READY, + TRANSFER_RELEASED, + TRANSFER_PASSTHROUGH +}; struct iax2_registry { struct sockaddr_in addr; /* Who we connect to for registration purposes */ @@ -384,7 +388,7 @@ struct iax2_registry { char random[80]; int expire; /* Sched ID of expiration */ int refresh; /* How often to refresh */ - int regstate; + enum iax_reg_state regstate; int messages; /* Message count */ int callno; /* Associated call number if applicable */ struct sockaddr_in us; /* Who the server thinks we are */ @@ -541,7 +545,7 @@ struct chan_iax2_pvt { unsigned int flags; /* Transferring status */ - int transferring; + enum iax_transfer_state transferring; /* Transfer identifier */ int transferid; /* Who we are IAX transfering to */ |