diff options
-rw-r--r-- | addons/ooh323c/src/ootypes.h | 76 | ||||
-rw-r--r-- | apps/app_adsiprog.c | 6 | ||||
-rw-r--r-- | apps/app_sms.c | 2 | ||||
-rw-r--r-- | bridges/bridge_softmix.c | 2 | ||||
-rw-r--r-- | bridges/bridge_softmix/bridge_softmix_binaural.c | 3 | ||||
-rw-r--r-- | bridges/bridge_softmix/include/bridge_softmix_internal.h | 3 | ||||
-rw-r--r-- | main/editline/term.c | 2 | ||||
-rw-r--r-- | main/pbx.c | 12 | ||||
-rw-r--r-- | res/res_http_websocket.c | 3 |
9 files changed, 56 insertions, 53 deletions
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/apps/app_adsiprog.c b/apps/app_adsiprog.c index 065902995..2dd226fbd 100644 --- a/apps/app_adsiprog.c +++ b/apps/app_adsiprog.c @@ -1109,7 +1109,7 @@ static int adsi_process(struct adsi_script *state, char *buf, const char *script tmp[7] = '\0'; } /* Setup initial stuff */ - state->key->retstr[0] = 128; + state->key->retstr[0] = 0x80; /* 1 has the length */ state->key->retstr[2] = state->key->id; /* Put the Full name in */ @@ -1145,7 +1145,7 @@ static int adsi_process(struct adsi_script *state, char *buf, const char *script break; } /* Setup sub */ - state->sub->data[0] = 130; + state->sub->data[0] = 0x82; /* 1 is the length */ state->sub->data[2] = 0x0; /* Clear extensibility bit */ state->sub->datalen = 3; @@ -1262,7 +1262,7 @@ static int adsi_process(struct adsi_script *state, char *buf, const char *script /* Something bad happened */ break; } - disp->data[0] = 129; + disp->data[0] = 0x81; disp->data[1] = disp->datalen - 2; disp->data[2] = ((lrci & 0x3) << 6) | disp->id; disp->data[3] = wi; diff --git a/apps/app_sms.c b/apps/app_sms.c index 88985fbc5..c50a68627 100644 --- a/apps/app_sms.c +++ b/apps/app_sms.c @@ -807,7 +807,7 @@ static void sms_log(sms_t * h, char status) *p++ = '\\'; *p++ = 'r'; } else if (h->ud[n] < 32 || h->ud[n] == 127) { - *p++ = 191; + *p++ = 0xbf; } else { *p++ = h->ud[n]; } diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c index 83b1a8337..334356943 100644 --- a/bridges/bridge_softmix.c +++ b/bridges/bridge_softmix.c @@ -1404,7 +1404,7 @@ static int softmix_mixing_loop(struct ast_bridge *bridge) } #ifdef BINAURAL_RENDERING - check_binaural_position_change(bridge, softmix_data, bridge_channel); + check_binaural_position_change(bridge, softmix_data); #endif /* Go through pulling audio from each factory that has it available */ diff --git a/bridges/bridge_softmix/bridge_softmix_binaural.c b/bridges/bridge_softmix/bridge_softmix_binaural.c index 128e4640e..2a8efd766 100644 --- a/bridges/bridge_softmix/bridge_softmix_binaural.c +++ b/bridges/bridge_softmix/bridge_softmix_binaural.c @@ -465,9 +465,10 @@ void softmix_process_write_binaural_audio(struct softmix_channel *sc, } void check_binaural_position_change(struct ast_bridge *bridge, - struct softmix_bridge_data *softmix_data, struct ast_bridge_channel *bridge_channel) + struct softmix_bridge_data *softmix_data) { unsigned int pos_change; + struct ast_bridge_channel *bridge_channel; /* * We only check binaural things if binaural is activated by the config diff --git a/bridges/bridge_softmix/include/bridge_softmix_internal.h b/bridges/bridge_softmix/include/bridge_softmix_internal.h index 01e65aa1f..f842acb5e 100644 --- a/bridges/bridge_softmix/include/bridge_softmix_internal.h +++ b/bridges/bridge_softmix/include/bridge_softmix_internal.h @@ -377,10 +377,9 @@ void softmix_process_write_binaural_audio(struct softmix_channel *sc, * * \param bridge The conference bridge. * \param softmix_data The data used by the softmix bridge. - * \param bridge_channel The bridge channel. */ void check_binaural_position_change(struct ast_bridge *bridge, - struct softmix_bridge_data *softmix_data, struct ast_bridge_channel *bridge_channel); + struct softmix_bridge_data *softmix_data); /*! * \brief Processes audio data with the binaural synthesis and adds the result to the mixing array. diff --git a/main/editline/term.c b/main/editline/term.c index 03623be21..6814cc4ca 100644 --- a/main/editline/term.c +++ b/main/editline/term.c @@ -428,7 +428,7 @@ term_alloc(EditLine *el, const struct termcapstr *t, const char *cap) */ tlen = 0; for (tmp = tlist; tmp < &tlist[T_str]; tmp++) - if (*tmp != NULL && *tmp != '\0' && *tmp != *str) { + if (*tmp != NULL && **tmp != '\0' && *tmp != *str) { char *ptr; for (ptr = *tmp; *ptr != '\0'; termbuf[tlen++] = *ptr++) diff --git a/main/pbx.c b/main/pbx.c index 12daa67bb..b850e8efd 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -2863,7 +2863,6 @@ static int pbx_extension_helper(struct ast_channel *c, struct ast_context *con, struct ast_exten *e; struct ast_app *app; char *substitute = NULL; - int res; struct pbx_find_info q = { .stacklen = 0 }; /* the rest is reset in pbx_find_extension */ char passdata[EXT_DATA_SIZE]; int matching_action = (action == E_MATCH || action == E_CANMATCH || action == E_MATCHMORE); @@ -2880,9 +2879,12 @@ static int pbx_extension_helper(struct ast_channel *c, struct ast_context *con, ast_unlock_contexts(); return -1; /* success, we found it */ } else if (action == E_FINDLABEL) { /* map the label to a priority */ - res = e->priority; + int res = e->priority; + ast_unlock_contexts(); - return res; /* the priority we were looking for */ + + /* the priority we were looking for */ + return res; } else { /* spawn */ if (!e->cached_app) e->cached_app = pbx_findapp(e->app); @@ -2932,7 +2934,7 @@ static int pbx_extension_helper(struct ast_channel *c, struct ast_context *con, } else { if (!q.swo->exec) { ast_log(LOG_WARNING, "No execution engine for switch %s\n", q.swo->name); - res = -1; + return -1; } return q.swo->exec(c, q.foundcontext ? q.foundcontext : context, exten, priority, callerid, q.data); } @@ -8922,7 +8924,7 @@ int ast_pbx_init(void) /* This is protected by the context_and_merge lock */ autohints = ao2_container_alloc_options(AO2_ALLOC_OPT_LOCK_NOLOCK, HASH_EXTENHINT_SIZE, autohint_hash_cb, autohint_cmp); - if (hintdevices) { + if (autohints) { ao2_container_register("autohints", autohints, print_autohint_key); } statecbs = ao2_container_alloc(1, NULL, statecbs_cmp); diff --git a/res/res_http_websocket.c b/res/res_http_websocket.c index baaa40fd9..86a154787 100644 --- a/res/res_http_websocket.c +++ b/res/res_http_websocket.c @@ -291,6 +291,7 @@ int AST_OPTIONAL_API_NAME(ast_websocket_server_remove_protocol)(struct ast_webso /*! \brief Close function for websocket session */ int AST_OPTIONAL_API_NAME(ast_websocket_close)(struct ast_websocket *session, uint16_t reason) { + enum ast_websocket_opcode opcode = AST_WEBSOCKET_OPCODE_CLOSE; char frame[4] = { 0, }; /* The header is 2 bytes and the reason code takes up another 2 bytes */ int res; @@ -298,7 +299,7 @@ int AST_OPTIONAL_API_NAME(ast_websocket_close)(struct ast_websocket *session, ui return 0; } - frame[0] = AST_WEBSOCKET_OPCODE_CLOSE | 0x80; + frame[0] = opcode | 0x80; frame[1] = 2; /* The reason code is always 2 bytes */ /* If no reason has been specified assume 1000 which is normal closure */ |