diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-08-23 13:23:12 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-08-23 13:23:12 +0000 |
commit | 0b50a6447fdf9894baa3b331dc1b69e3610641bb (patch) | |
tree | 0e7a5c3ca9f7ab6a87399abcc30cff2cff379e92 /include | |
parent | 815b5b09da5e555add7bba3d8fca588e7611248a (diff) | |
parent | d92034ae2fa3b27f06d5e213645e55b4a7d9e541 (diff) |
Make the AST_CEL_AMA enum match up with the AST_CDR_ ama flag values.
Really, having 2 enums for this is silly and error prone, demonstrated by
the crash that I hit because there was an assumption in the code that the
values in each matched up. However, this is a quick fix to get them to
match up so it will work.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@283230 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rw-r--r-- | include/asterisk/ccss.h | 19 | ||||
-rw-r--r-- | include/asterisk/cel.h | 7 | ||||
-rw-r--r-- | include/asterisk/event_defs.h | 4 | ||||
-rw-r--r-- | include/asterisk/netsock2.h | 20 | ||||
-rw-r--r-- | include/asterisk/pbx.h | 8 | ||||
-rw-r--r-- | include/asterisk/sched.h | 10 | ||||
-rw-r--r-- | include/asterisk/translate.h | 8 | ||||
-rw-r--r-- | include/asterisk/unaligned.h | 2 |
8 files changed, 60 insertions, 18 deletions
diff --git a/include/asterisk/ccss.h b/include/asterisk/ccss.h index 4dc8e5922..31073a478 100644 --- a/include/asterisk/ccss.h +++ b/include/asterisk/ccss.h @@ -189,6 +189,21 @@ int ast_cc_is_config_param(const char * const name); /*! * \since 1.8 + * \brief Set the specified CC config params to default values. + * + * \details + * This is just like ast_cc_copy_config_params() and could be used in place + * of it if you need to set the config params to defaults instead. + * You are simply "copying" defaults into the destination. + * + * \param params CC config params to set to default values. + * + * \return Nothing + */ +void ast_cc_default_config_params(struct ast_cc_config_params *params); + +/*! + * \since 1.8 * \brief copy CCSS configuration parameters from one structure to another * * \details @@ -199,8 +214,8 @@ int ast_cc_is_config_param(const char * const name); * * \param src The structure from which data is copied * \param dest The structure to which data is copied - * \retval -1 Copy failed (no way for this to happen yet) - * \retval 0 Copy succeeded + * + * \return Nothing */ void ast_cc_copy_config_params(struct ast_cc_config_params *dest, const struct ast_cc_config_params *src); diff --git a/include/asterisk/cel.h b/include/asterisk/cel.h index f221dd643..353c06110 100644 --- a/include/asterisk/cel.h +++ b/include/asterisk/cel.h @@ -28,8 +28,13 @@ extern "C" { #include "asterisk/event.h" -/*! \brief AMA Flags */ +/*! + * \brief AMA Flags + * + * \note This must much up with the AST_CDR_* defines for AMA flags. + */ enum ast_cel_ama_flag { + AST_CEL_AMA_FLAG_NONE, AST_CEL_AMA_FLAG_OMIT, AST_CEL_AMA_FLAG_BILLING, AST_CEL_AMA_FLAG_DOCUMENTATION, diff --git a/include/asterisk/event_defs.h b/include/asterisk/event_defs.h index 3779dac73..073d67bc6 100644 --- a/include/asterisk/event_defs.h +++ b/include/asterisk/event_defs.h @@ -52,8 +52,10 @@ enum ast_event_type { AST_EVENT_CEL = 0x07, /*! A report of a security related event (see security_events.h) */ AST_EVENT_SECURITY = 0x08, + /*! Used by res_stun_monitor to alert listeners to an exernal network address change. */ + AST_EVENT_NETWORK_CHANGE = 0x09, /*! Number of event types. This should be the last event type + 1 */ - AST_EVENT_TOTAL = 0x09, + AST_EVENT_TOTAL = 0x0a, }; /*! \brief Event Information Element types */ diff --git a/include/asterisk/netsock2.h b/include/asterisk/netsock2.h index 24330d236..73c57c5d2 100644 --- a/include/asterisk/netsock2.h +++ b/include/asterisk/netsock2.h @@ -233,6 +233,26 @@ static inline char *ast_sockaddr_stringify_port(const struct ast_sockaddr *addr) * \since 1.8 * * \brief + * Splits a string into its host and port components + * + * \param str[in] The string to parse. May be modified by writing a NUL at the end of + * the host part. + * \param host[out] Pointer to the host component within \a str. + * \param port[out] Pointer to the port component within \a str. + * \param flags If set to zero, a port MAY be present. If set to PARSE_PORT_IGNORE, a + * port MAY be present but will be ignored. If set to PARSE_PORT_REQUIRE, + * a port MUST be present. If set to PARSE_PORT_FORBID, a port MUST NOT + * be present. + * + * \retval 1 Success + * \retval 0 Failure + */ +int ast_sockaddr_split_hostport(char *str, char **host, char **port, int flags); + +/*! + * \since 1.8 + * + * \brief * Parse an IPv4 or IPv6 address string. * * \details diff --git a/include/asterisk/pbx.h b/include/asterisk/pbx.h index ac09f009b..a0ef3d476 100644 --- a/include/asterisk/pbx.h +++ b/include/asterisk/pbx.h @@ -1220,14 +1220,6 @@ struct ast_exten *pbx_find_extension(struct ast_channel *chan, const char *context, const char *exten, int priority, const char *label, const char *callerid, enum ext_match_t action); - -/* every time a write lock is obtained for contexts, - a counter is incremented. You can check this via the - following func */ - -int ast_wrlock_contexts_version(void); - - /*! \brief hashtable functions for contexts */ /*! @{ */ int ast_hashtab_compare_contexts(const void *ah_a, const void *ah_b); diff --git a/include/asterisk/sched.h b/include/asterisk/sched.h index 3904daf36..4f5fb4217 100644 --- a/include/asterisk/sched.h +++ b/include/asterisk/sched.h @@ -53,7 +53,7 @@ extern "C" { int _count = 0; \ int _sched_res = -1; \ while (id > -1 && (_sched_res = ast_sched_del(sched, id)) && ++_count < 10) \ - usleep(1000); \ + usleep(1); \ if (_count == 10 && option_debug > 2) { \ ast_log(LOG_DEBUG, "Unable to cancel schedule ID %d.\n", id); \ } \ @@ -70,7 +70,7 @@ extern "C" { do { \ int _count = 0; \ while (id > -1 && ast_sched_del(sched, id) && ++_count < 10) { \ - usleep(1000); \ + usleep(1); \ } \ if (_count == 10) \ ast_log(LOG_WARNING, "Unable to cancel schedule ID %d. This is probably a bug (%s: %s, line %d).\n", id, __FILE__, __PRETTY_FUNCTION__, __LINE__); \ @@ -89,7 +89,7 @@ extern "C" { int _sched_res = -1; \ while (id > -1 && (_sched_res = ast_sched_del(sched, id)) && ++_count < 10) { \ ast_mutex_unlock(lock); \ - usleep(1000); \ + usleep(1); \ ast_mutex_lock(lock); \ } \ if (_count == 10 && option_debug > 2) { \ @@ -103,7 +103,7 @@ extern "C" { do { \ int _count = 0; \ while (id > -1 && ast_sched_del(sched, id) && ++_count < 10) { \ - usleep(1000); \ + usleep(1); \ } \ if (_count == 10) \ ast_log(LOG_WARNING, "Unable to cancel schedule ID %d. This is probably a bug (%s: %s, line %d).\n", id, __FILE__, __PRETTY_FUNCTION__, __LINE__); \ @@ -122,7 +122,7 @@ extern "C" { int _count = 0, _res=1; \ void *_data = (void *)ast_sched_find_data(sched, id); \ while (id > -1 && (_res = ast_sched_del(sched, id) && _count++ < 10)) { \ - usleep(1000); \ + usleep(1); \ } \ if (!_res && _data) \ unrefcall; /* should ref _data! */ \ diff --git a/include/asterisk/translate.h b/include/asterisk/translate.h index 1d87adbf5..821463bf1 100644 --- a/include/asterisk/translate.h +++ b/include/asterisk/translate.h @@ -254,6 +254,14 @@ unsigned int ast_translate_path_steps(format_t dest, format_t src); */ format_t ast_translate_available_formats(format_t dest, format_t src); +/*! + * \brief Puts a string representation of the translation path into outbuf + * \param translator structure containing the translation path + * \param ast_str output buffer + * \retval on success pointer to beginning of outbuf. on failure "". + */ +const char *ast_translate_path_to_str(struct ast_trans_pvt *t, struct ast_str **str); + #if defined(__cplusplus) || defined(c_plusplus) } #endif diff --git a/include/asterisk/unaligned.h b/include/asterisk/unaligned.h index 63f430f89..9e6e743da 100644 --- a/include/asterisk/unaligned.h +++ b/include/asterisk/unaligned.h @@ -50,7 +50,7 @@ static inline unsigned short get_unaligned_uint16(const void *p) static inline void put_unaligned_uint64(void *p, uint64_t datum) { - struct { unsigned int d; } __attribute__((packed,may_alias)) *pp = p; + struct { uint64_t d; } __attribute__((packed,may_alias)) *pp = p; pp->d = datum; } |