diff options
Diffstat (limited to 'addons')
-rw-r--r-- | addons/chan_ooh323.c | 7 | ||||
-rw-r--r-- | addons/ooh323c/src/ootypes.h | 76 | ||||
-rw-r--r-- | addons/ooh323cDriver.h | 2 |
3 files changed, 44 insertions, 41 deletions
diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c index 285ed2849..3afcecd96 100644 --- a/addons/chan_ooh323.c +++ b/addons/chan_ooh323.c @@ -2604,9 +2604,12 @@ static struct ooh323_peer *build_peer(const char *name, struct ast_variable *v, } } else if (!strcasecmp(v->name, "outgoinglimit")) { - peer->outgoinglimit = atoi(v->value); - if (peer->outgoinglimit < 0) + int val = atoi(v->value); + if (val < 0) { peer->outgoinglimit = 0; + } else { + peer->outgoinglimit = val; + } } else if (!strcasecmp(v->name, "accountcode")) { ast_copy_string(peer->accountcode, v->value, sizeof(peer->accountcode)); } else if (!strcasecmp(v->name, "faststart")) { diff --git a/addons/ooh323c/src/ootypes.h b/addons/ooh323c/src/ootypes.h index cc7cd7c36..71a7219a6 100644 --- a/addons/ooh323c/src/ootypes.h +++ b/addons/ooh323c/src/ootypes.h @@ -154,45 +154,45 @@ typedef enum OOCallClearReason { /** Various message types for H225 and H245 messages */ -#define OO_MSGTYPE_MIN 101 -#define OOQ931MSG 101 -#define OOH245MSG 102 -#define OOSetup 103 -#define OOCallProceeding 104 -#define OOAlert 105 -#define OOConnect 106 -#define OOReleaseComplete 107 -#define OOFacility 108 -#define OOInformationMessage 109 -#define OOMasterSlaveDetermination 110 -#define OOMasterSlaveAck 111 -#define OOMasterSlaveReject 112 -#define OOMasterSlaveRelease 113 -#define OOTerminalCapabilitySet 114 -#define OOTerminalCapabilitySetAck 115 -#define OOTerminalCapabilitySetReject 116 -#define OOTerminalCapabilitySetRelease 117 -#define OOOpenLogicalChannel 118 -#define OOOpenLogicalChannelAck 119 -#define OOOpenLogicalChannelReject 120 -#define OOOpenLogicalChannelRelease 121 -#define OOOpenLogicalChannelConfirm 122 -#define OOCloseLogicalChannel 123 -#define OOCloseLogicalChannelAck 124 -#define OORequestChannelClose 125 -#define OORequestChannelCloseAck 126 -#define OORequestChannelCloseReject 127 -#define OORequestChannelCloseRelease 128 -#define OOEndSessionCommand 129 -#define OOUserInputIndication 130 -#define OORequestModeAck 131 -#define OORequestModeReject 132 -#define OORequestMode 133 -#define OORequestDelayResponse 134 -#define OORequestDelayRequest 135 -#define OOStatus 136 +#define OO_MSGTYPE_MIN 0x65 +#define OOQ931MSG 0x65 +#define OOH245MSG 0x66 +#define OOSetup 0x67 +#define OOCallProceeding 0x68 +#define OOAlert 0x69 +#define OOConnect 0x6a +#define OOReleaseComplete 0x6b +#define OOFacility 0x6c +#define OOInformationMessage 0x6d +#define OOMasterSlaveDetermination 0x6e +#define OOMasterSlaveAck 0x6f +#define OOMasterSlaveReject 0x70 +#define OOMasterSlaveRelease 0x71 +#define OOTerminalCapabilitySet 0x72 +#define OOTerminalCapabilitySetAck 0x73 +#define OOTerminalCapabilitySetReject 0x74 +#define OOTerminalCapabilitySetRelease 0x75 +#define OOOpenLogicalChannel 0x76 +#define OOOpenLogicalChannelAck 0x77 +#define OOOpenLogicalChannelReject 0x78 +#define OOOpenLogicalChannelRelease 0x79 +#define OOOpenLogicalChannelConfirm 0x7a +#define OOCloseLogicalChannel 0x7b +#define OOCloseLogicalChannelAck 0x7c +#define OORequestChannelClose 0x7d +#define OORequestChannelCloseAck 0x7e +#define OORequestChannelCloseReject 0x7f +#define OORequestChannelCloseRelease 0x80 +#define OOEndSessionCommand 0x81 +#define OOUserInputIndication 0x82 +#define OORequestModeAck 0x83 +#define OORequestModeReject 0x84 +#define OORequestMode 0x85 +#define OORequestDelayResponse 0x86 +#define OORequestDelayRequest 0x87 +#define OOStatus 0x88 -#define OO_MSGTYPE_MAX 136 +#define OO_MSGTYPE_MAX 0x88 /* Timer types */ #define OO_CALLESTB_TIMER (1<<0) diff --git a/addons/ooh323cDriver.h b/addons/ooh323cDriver.h index 333f01f33..00bf9b551 100644 --- a/addons/ooh323cDriver.h +++ b/addons/ooh323cDriver.h @@ -14,7 +14,7 @@ * *****************************************************************************/ #ifndef _OO_H323CDRIVER_H_ -#define __OO_H323DRIVER_H_ +#define _OO_H323CDRIVER_H_ #include "chan_ooh323.h" #include "ootypes.h" #include "ooh323ep.h" |