diff options
Diffstat (limited to 'include/asterisk')
| -rw-r--r-- | include/asterisk/cli.h | 14 | ||||
| -rw-r--r-- | include/asterisk/crypto.h | 20 | ||||
| -rw-r--r-- | include/asterisk/dns.h | 4 | ||||
| -rw-r--r-- | include/asterisk/enum.h | 20 | ||||
| -rw-r--r-- | include/asterisk/image.h | 32 | ||||
| -rw-r--r-- | include/asterisk/io.h | 26 | ||||
| -rw-r--r-- | include/asterisk/musiconhold.h | 2 | ||||
| -rw-r--r-- | include/asterisk/rtp.h | 14 | ||||
| -rw-r--r-- | include/asterisk/sched.h | 38 | ||||
| -rw-r--r-- | include/asterisk/term.h | 32 |
10 files changed, 101 insertions, 101 deletions
diff --git a/include/asterisk/cli.h b/include/asterisk/cli.h index d9c9b7ab3..02cdb290f 100644 --- a/include/asterisk/cli.h +++ b/include/asterisk/cli.h @@ -44,7 +44,7 @@ void ast_cli(int fd, char *fmt, ...) #define AST_CLI_COMPLETE_EOF "_EOF_" -/*! \brief A command line entry */ +/*! \brief A command line entry */ struct ast_cli_entry { char * const cmda[AST_MAX_CMD_LEN]; /*! Handler for the command (fd for output, # of args, argument list). @@ -95,20 +95,20 @@ struct ast_cli_entry { */ char *ast_cli_complete(const char *word, char *const choices[], int pos); -/*! \brief Interprets a command +/*! \brief Interprets a command * Interpret a command s, sending output to fd - * Returns 0 on succes, -1 on failure + * Returns 0 on succes, -1 on failure */ int ast_cli_command(int fd, const char *s); -/*! \brief Registers a command or an array of commands +/*! \brief Registers a command or an array of commands * \param e which cli entry to register * Register your own command * Returns 0 on success, -1 on failure */ int ast_cli_register(struct ast_cli_entry *e); -/*! +/*! * \brief Register multiple commands * \param e pointer to first cli entry to register * \param len number of entries to register @@ -130,7 +130,7 @@ int ast_cli_unregister(struct ast_cli_entry *e); */ void ast_cli_unregister_multiple(struct ast_cli_entry *e, int len); -/*! \brief Readline madness +/*! \brief Readline madness * Useful for readline, that's about it * Returns 0 on success, -1 on failure */ @@ -140,7 +140,7 @@ int ast_cli_generatornummatches(const char *, const char *); /*! * \brief Generates a NULL-terminated array of strings that - * 1) begin with the string in the second parameter, and + * 1) begin with the string in the second parameter, and * 2) are valid in a command after the string in the first parameter. * * The first entry (offset 0) of the result is the longest common substring diff --git a/include/asterisk/crypto.h b/include/asterisk/crypto.h index d0f852caf..32233fc17 100644 --- a/include/asterisk/crypto.h +++ b/include/asterisk/crypto.h @@ -32,15 +32,15 @@ extern "C" { struct ast_key; -/*! \brief Retrieve a key +/*! \brief Retrieve a key * \param name of the key we are retrieving * \param int type of key (AST_KEY_PUBLIC or AST_KEY_PRIVATE) * * Returns the key on success or NULL on failure */ -extern struct ast_key *(*ast_key_get)(const char *key, int type); +struct ast_key *(*ast_key_get)(const char *key, int type); -/*! \brief Check the authenticity of a message signature using a given public key +/*! \brief Check the authenticity of a message signature using a given public key * \param key a public key to use to verify * \param msg the message that has been signed * \param sig the proposed valid signature in mime64-like encoding @@ -48,9 +48,9 @@ extern struct ast_key *(*ast_key_get)(const char *key, int type); * Returns 0 if the signature is valid, or -1 otherwise * */ -extern int (*ast_check_signature)(struct ast_key *key, const char *msg, const char *sig); +int (*ast_check_signature)(struct ast_key *key, const char *msg, const char *sig); -/*! \brief Check the authenticity of a message signature using a given public key +/*! \brief Check the authenticity of a message signature using a given public key * \param key a public key to use to verify * \param msg the message that has been signed * \param sig the proposed valid signature in raw binary representation @@ -58,7 +58,7 @@ extern int (*ast_check_signature)(struct ast_key *key, const char *msg, const ch * Returns 0 if the signature is valid, or -1 otherwise * */ -extern int (*ast_check_signature_bin)(struct ast_key *key, const char *msg, int msglen, const unsigned char *sig); +int (*ast_check_signature_bin)(struct ast_key *key, const char *msg, int msglen, const unsigned char *sig); /*! * \param key a private key to use to create the signature @@ -69,7 +69,7 @@ extern int (*ast_check_signature_bin)(struct ast_key *key, const char *msg, int * Returns 0 on success or -1 on failure. * */ -extern int (*ast_sign)(struct ast_key *key, char *msg, char *sig); +int (*ast_sign)(struct ast_key *key, char *msg, char *sig); /*! * \param key a private key to use to create the signature @@ -80,7 +80,7 @@ extern int (*ast_sign)(struct ast_key *key, char *msg, char *sig); * Returns 0 on success or -1 on failure. * */ -extern int (*ast_sign_bin)(struct ast_key *key, const char *msg, int msglen, unsigned char *sig); +int (*ast_sign_bin)(struct ast_key *key, const char *msg, int msglen, unsigned char *sig); /*! * \param key a private key to use to encrypt @@ -92,7 +92,7 @@ extern int (*ast_sign_bin)(struct ast_key *key, const char *msg, int msglen, uns * Returns length of encrypted data on success or -1 on failure. * */ -extern int (*ast_encrypt_bin)(unsigned char *dst, const unsigned char *src, int srclen, struct ast_key *key); +int (*ast_encrypt_bin)(unsigned char *dst, const unsigned char *src, int srclen, struct ast_key *key); /*! * \param key a private key to use to decrypt @@ -104,7 +104,7 @@ extern int (*ast_encrypt_bin)(unsigned char *dst, const unsigned char *src, int * Returns length of decrypted data on success or -1 on failure. * */ -extern int (*ast_decrypt_bin)(unsigned char *dst, const unsigned char *src, int srclen, struct ast_key *key); +int (*ast_decrypt_bin)(unsigned char *dst, const unsigned char *src, int srclen, struct ast_key *key); #if defined(__cplusplus) || defined(c_plusplus) } #endif diff --git a/include/asterisk/dns.h b/include/asterisk/dns.h index 615351b8a..a549f5edb 100644 --- a/include/asterisk/dns.h +++ b/include/asterisk/dns.h @@ -26,7 +26,7 @@ struct ast_channel; -/*! \brief Perform DNS lookup (used by DNS, enum and SRV lookups) +/*! \brief Perform DNS lookup (used by DNS, enum and SRV lookups) \param context \param dname Domain name to lookup (host, SRV domain, TXT record name) \param class Record Class (see "man res_search") @@ -35,7 +35,7 @@ struct ast_channel; \note Asterisk DNS is synchronus at this time. This means that if your DNS services does not work, Asterisk may lock while waiting for response. */ -extern int ast_search_dns(void *context, const char *dname, int class, int type, +int ast_search_dns(void *context, const char *dname, int class, int type, int (*callback)(void *context, char *answer, int len, char *fullanswer)); #endif /* _ASTERISK_DNS_H */ diff --git a/include/asterisk/enum.h b/include/asterisk/enum.h index e36a9d910..b5b88479a 100644 --- a/include/asterisk/enum.h +++ b/include/asterisk/enum.h @@ -27,21 +27,21 @@ /*! \brief Lookup entry in ENUM Returns 1 if found, 0 if not found, -1 on hangup \param chan Channel - \param number E164 number with or without the leading + + \param number E164 number with or without the leading + \param location Number returned (or SIP uri) \param maxloc Max length - \param technology Technology (from url scheme in response) + \param technology Technology (from url scheme in response) You can set it to get particular answer RR, if there are many techs in DNS response, example: "sip" If you need any record, then set it to empty string - \param maxtech Max length - \param suffix Zone suffix (if is NULL then use enum.conf 'search' variable) - \param options Options ('c' to count number of NAPTR RR, or number - the position of required RR in the answer list + \param maxtech Max length + \param suffix Zone suffix (if is NULL then use enum.conf 'search' variable) + \param options Options ('c' to count number of NAPTR RR, or number - the position of required RR in the answer list */ -extern int ast_get_enum(struct ast_channel *chan, const char *number, char *location, int maxloc, char *technology, int maxtech, char* suffix, char* options); +int ast_get_enum(struct ast_channel *chan, const char *number, char *location, int maxloc, char *technology, int maxtech, char* suffix, char* options); /*! \brief Lookup DNS TXT record (used by app TXTCIDnum \param chan Channel - \param number E164 number with or without the leading + + \param number E164 number with or without the leading + \param location Number returned (or SIP uri) \param maxloc Max length of number \param technology Technology (not used in TXT records) @@ -49,9 +49,9 @@ extern int ast_get_enum(struct ast_channel *chan, const char *number, char *loca \param txt Text string (return value) \param maxtxt Max length of "txt" */ -extern int ast_get_txt(struct ast_channel *chan, const char *number, char *location, int maxloc, char *technology, int maxtech, char *txt, int maxtxt); +int ast_get_txt(struct ast_channel *chan, const char *number, char *location, int maxloc, char *technology, int maxtech, char *txt, int maxtxt); -extern int ast_enum_init(void); -extern int ast_enum_reload(void); +int ast_enum_init(void); +int ast_enum_reload(void); #endif /* _ASTERISK_ENUM_H */ diff --git a/include/asterisk/image.h b/include/asterisk/image.h index 32953363e..72d1a4018 100644 --- a/include/asterisk/image.h +++ b/include/asterisk/image.h @@ -26,30 +26,30 @@ /*! \brief structure associated with registering an image format */ struct ast_imager { /*! Name */ - char *name; + char *name; /*! Description */ - char *desc; + char *desc; /*! Extension(s) (separated by '|' ) */ - char *exts; + char *exts; /*! Image format */ - int format; + int format; /*! Read an image from a file descriptor */ - struct ast_frame *(*read_image)(int fd, int len); + struct ast_frame *(*read_image)(int fd, int len); /*! Identify if this is that type of file */ - int (*identify)(int fd); + int (*identify)(int fd); /*! Returns length written */ - int (*write_image)(int fd, struct ast_frame *frame); + int (*write_image)(int fd, struct ast_frame *frame); /*! For linked list */ AST_LIST_ENTRY(ast_imager) list; }; /*! Check for image support on a channel */ -/*! +/*! * \param chan channel to check * Checks the channel to see if it supports the transmission of images * Returns non-zero if image transmission is supported */ -extern int ast_supports_images(struct ast_channel *chan); +int ast_supports_images(struct ast_channel *chan); /*! Sends an image */ /*! @@ -58,25 +58,25 @@ extern int ast_supports_images(struct ast_channel *chan); * Sends an image on the given channel. * Returns 0 on success, -1 on error */ -extern int ast_send_image(struct ast_channel *chan, char *filename); +int ast_send_image(struct ast_channel *chan, char *filename); /*! Make an image */ -/*! +/*! * \param filename filename of image to prepare * \param preflang preferred language to get the image...? * \param format the format of the file * Make an image from a filename ??? No estoy positivo * Returns an ast_frame on success, NULL on failure */ -extern struct ast_frame *ast_read_image(char *filename, const char *preflang, int format); +struct ast_frame *ast_read_image(char *filename, const char *preflang, int format); /*! Register image format */ -/*! +/*! * \param imgdrv Populated ast_imager structure with info to register * Registers an image format * Returns 0 regardless */ -extern int ast_image_register(struct ast_imager *imgdrv); +int ast_image_register(struct ast_imager *imgdrv); /*! Unregister an image format */ /*! @@ -84,13 +84,13 @@ extern int ast_image_register(struct ast_imager *imgdrv); * Unregisters the image format passed in * Returns nothing */ -extern void ast_image_unregister(struct ast_imager *imgdrv); +void ast_image_unregister(struct ast_imager *imgdrv); /*! Initialize image stuff */ /*! * Initializes all the various image stuff. Basically just registers the cli stuff * Returns 0 all the time */ -extern int ast_image_init(void); +int ast_image_init(void); #endif /* _ASTERISK_IMAGE_H */ diff --git a/include/asterisk/io.h b/include/asterisk/io.h index c33fb515b..66ebceea0 100644 --- a/include/asterisk/io.h +++ b/include/asterisk/io.h @@ -62,7 +62,7 @@ struct io_context; * Basically mallocs an IO structure and sets up some default values. * Returns an allocated io_context structure */ -extern struct io_context *io_context_create(void); +struct io_context *io_context_create(void); /*! Destroys a context */ /* @@ -70,22 +70,22 @@ extern struct io_context *io_context_create(void); * Destroy a context for I/O operations * Frees all memory associated with the given io_context structure along with the structure itself */ -extern void io_context_destroy(struct io_context *ioc); +void io_context_destroy(struct io_context *ioc); typedef int (*ast_io_cb)(int *id, int fd, short events, void *cbdata); #define AST_IO_CB(a) ((ast_io_cb)(a)) /*! Adds an IO context */ -/*! +/*! * \param ioc which context to use * \param fd which fd to monitor * \param callback callback function to run * \param events event mask of events to wait for * \param data data to pass to the callback - * Watch for any of revents activites on fd, calling callback with data as + * Watch for any of revents activites on fd, calling callback with data as * callback data. Returns a pointer to ID of the IO event, or NULL on failure. */ -extern int *ast_io_add(struct io_context *ioc, int fd, ast_io_cb callback, short events, void *data); +int *ast_io_add(struct io_context *ioc, int fd, ast_io_cb callback, short events, void *data); /*! Changes an IO handler */ /*! @@ -99,15 +99,15 @@ extern int *ast_io_add(struct io_context *ioc, int fd, ast_io_cb callback, short * if >-1, and data if non-null. Returns a pointero to the ID of the IO event, * or NULL on failure. */ -extern int *ast_io_change(struct io_context *ioc, int *id, int fd, ast_io_cb callback, short events, void *data); +int *ast_io_change(struct io_context *ioc, int *id, int fd, ast_io_cb callback, short events, void *data); /*! Removes an IO context */ -/*! +/*! * \param ioc which io_context to remove it from * \param id which ID to remove * Remove an I/O id from consideration Returns 0 on success or -1 on failure. */ -extern int ast_io_remove(struct io_context *ioc, int *id); +int ast_io_remove(struct io_context *ioc, int *id); /*! Waits for IO */ /*! @@ -118,25 +118,25 @@ extern int ast_io_remove(struct io_context *ioc, int *id); * any necessary I/O. Returns the number of * I/O events which took place. */ -extern int ast_io_wait(struct io_context *ioc, int howlong); +int ast_io_wait(struct io_context *ioc, int howlong); /*! Dumps the IO array */ /* * Debugging: Dump everything in the I/O array */ -extern void ast_io_dump(struct io_context *ioc); +void ast_io_dump(struct io_context *ioc); /*! Set fd into non-echoing mode (if fd is a tty) */ -extern int ast_hide_password(int fd); +int ast_hide_password(int fd); /*! Restores TTY mode */ /* * Call with result from previous ast_hide_password */ -extern int ast_restore_tty(int fd, int oldstatus); +int ast_restore_tty(int fd, int oldstatus); -extern int ast_get_termcols(int fd); +int ast_get_termcols(int fd); #if defined(__cplusplus) || defined(c_plusplus) } diff --git a/include/asterisk/musiconhold.h b/include/asterisk/musiconhold.h index a3b231722..55a761c2f 100644 --- a/include/asterisk/musiconhold.h +++ b/include/asterisk/musiconhold.h @@ -36,7 +36,7 @@ void ast_moh_stop(struct ast_channel *chan); void ast_install_music_functions(int (*start_ptr)(struct ast_channel *, const char *), void (*stop_ptr)(struct ast_channel *), void (*cleanup_ptr)(struct ast_channel *)); - + void ast_uninstall_music_functions(void); void ast_moh_cleanup(struct ast_channel *chan); diff --git a/include/asterisk/rtp.h b/include/asterisk/rtp.h index c64f76684..3b19da0cc 100644 --- a/include/asterisk/rtp.h +++ b/include/asterisk/rtp.h @@ -16,10 +16,10 @@ * at the top of the source tree. */ -/*! +/*! * \file rtp.h * \brief Supports RTP and RTCP with Symmetric RTP support for NAT traversal. - * + * * RTP is defined in RFC 3550. */ @@ -62,9 +62,9 @@ struct ast_rtp_protocol { /*! * \brief Structure representing a RTP session. - * + * * RTP session is defined on page 9 of RFC 3550: "An association among a set of participants communicating with RTP. A participant may be involved in multiple RTP sessions at the same time [...]" - * + * */ struct ast_rtp; @@ -72,7 +72,7 @@ typedef int (*ast_rtp_callback)(struct ast_rtp *rtp, struct ast_frame *f, void * /*! * \brief Initializate a RTP session. - * + * * \param sched * \param io * \param rtcpenable @@ -83,9 +83,9 @@ struct ast_rtp *ast_rtp_new(struct sched_context *sched, struct io_context *io, /*! * \brief Initializate a RTP session using an in_addr structure. - * + * * This fuction gets called by ast_rtp_new(). - * + * * \param sched * \param io * \param rtcpenable diff --git a/include/asterisk/sched.h b/include/asterisk/sched.h index b1d47f019..00dc7a0a2 100644 --- a/include/asterisk/sched.h +++ b/include/asterisk/sched.h @@ -27,21 +27,21 @@ extern "C" { #endif -/*! \brief Max num of schedule structs +/*! \brief Max num of schedule structs * \note The max number of schedule structs to keep around * for use. Undefine to disable schedule structure - * caching. (Only disable this on very low memory + * caching. (Only disable this on very low memory * machines) */ #define SCHED_MAX_CACHE 128 struct sched_context; -/*! \brief New schedule context +/*! \brief New schedule context * \note Create a scheduling context * \return Returns a malloc'd sched_context structure, NULL on failure */ -extern struct sched_context *sched_context_create(void); +struct sched_context *sched_context_create(void); /*! \brief destroys a schedule context * Destroys (free's) the given sched_context structure @@ -58,8 +58,8 @@ void sched_context_destroy(struct sched_context *c); typedef int (*ast_sched_cb)(void *data); #define AST_SCHED_CB(a) ((ast_sched_cb)(a)) -/*! \brief Adds a scheduled event - * Schedule an event to take place at some point in the future. callback +/*! \brief Adds a scheduled event + * Schedule an event to take place at some point in the future. callback * will be called with data as the argument, when milliseconds into the * future (approximately) * If callback returns 0, no further events will be re-scheduled @@ -69,63 +69,63 @@ typedef int (*ast_sched_cb)(void *data); * \param data data to pass to the callback * \return Returns a schedule item ID on success, -1 on failure */ -extern int ast_sched_add(struct sched_context *con, int when, ast_sched_cb callback, void *data); +int ast_sched_add(struct sched_context *con, int when, ast_sched_cb callback, void *data); /*!Adds a scheduled event with rescheduling support * \param con Scheduler context to add * \param when how many milliseconds to wait for event to occur * \param callback function to call when the amount of time expires * \param data data to pass to the callback - * \param variable If true, the result value of callback function will be + * \param variable If true, the result value of callback function will be * used for rescheduling - * Schedule an event to take place at some point in the future. Callback + * Schedule an event to take place at some point in the future. Callback * will be called with data as the argument, when milliseconds into the * future (approximately) * If callback returns 0, no further events will be re-scheduled * \return Returns a schedule item ID on success, -1 on failure */ -extern int ast_sched_add_variable(struct sched_context *con, int when, ast_sched_cb callback, void *data, int variable); +int ast_sched_add_variable(struct sched_context *con, int when, ast_sched_cb callback, void *data, int variable); -/*! \brief Deletes a scheduled event +/*! \brief Deletes a scheduled event * Remove this event from being run. A procedure should not remove its * own event, but return 0 instead. * \param con scheduling context to delete item from * \param id ID of the scheduled item to delete * \return Returns 0 on success, -1 on failure */ -extern int ast_sched_del(struct sched_context *con, int id); +int ast_sched_del(struct sched_context *con, int id); -/*! \brief Determines number of seconds until the next outstanding event to take place +/*! \brief Determines number of seconds until the next outstanding event to take place * Determine the number of seconds until the next outstanding event * should take place, and return the number of milliseconds until * it needs to be run. This value is perfect for passing to the poll - * call. + * call. * \param con context to act upon * \return Returns "-1" if there is nothing there are no scheduled events * (and thus the poll should not timeout) */ -extern int ast_sched_wait(struct sched_context *con); +int ast_sched_wait(struct sched_context *con); -/*! \brief Runs the queue +/*! \brief Runs the queue * \param con Scheduling context to run * Run the queue, executing all callbacks which need to be performed * at this time. * \param con context to act upon * \return Returns the number of events processed. */ -extern int ast_sched_runq(struct sched_context *con); +int ast_sched_runq(struct sched_context *con); /*! \brief Dumps the scheduler contents * Debugging: Dump the contents of the scheduler to stderr * \param con Context to dump */ -extern void ast_sched_dump(const struct sched_context *con); +void ast_sched_dump(const struct sched_context *con); /*! \brief Returns the number of seconds before an event takes place * \param con Context to use * \param id Id to dump */ -extern long ast_sched_when(struct sched_context *con,int id); +long ast_sched_when(struct sched_context *con,int id); /*! * \brief Convenience macro for objects and reference (add) diff --git a/include/asterisk/term.h b/include/asterisk/term.h index 499927600..f3c41d8eb 100644 --- a/include/asterisk/term.h +++ b/include/asterisk/term.h @@ -37,35 +37,35 @@ extern "C" { #define ATTR_HIDDEN 8 #define COLOR_BLACK 30 -#define COLOR_GRAY 30 | 128 +#define COLOR_GRAY (30 | 128) #define COLOR_RED 31 -#define COLOR_BRRED 31 | 128 +#define COLOR_BRRED (31 | 128) #define COLOR_GREEN 32 -#define COLOR_BRGREEN 32 | 128 +#define COLOR_BRGREEN (32 | 128) #define COLOR_BROWN 33 -#define COLOR_YELLOW 33 | 128 -#define COLOR_BLUE 34 -#define COLOR_BRBLUE 34 | 128 +#define COLOR_YELLOW (33 | 128) +#define COLOR_BLUE 34 +#define COLOR_BRBLUE (34 | 128) #define COLOR_MAGENTA 35 -#define COLOR_BRMAGENTA 35 | 128 +#define COLOR_BRMAGENTA (35 | 128) #define COLOR_CYAN 36 -#define COLOR_BRCYAN 36 | 128 +#define COLOR_BRCYAN (36 | 128) #define COLOR_WHITE 37 -#define COLOR_BRWHITE 37 | 128 +#define COLOR_BRWHITE (37 | 128) -extern char *term_color(char *outbuf, const char *inbuf, int fgcolor, int bgcolor, int maxout); +char *term_color(char *outbuf, const char *inbuf, int fgcolor, int bgcolor, int maxout); -extern char *term_color_code(char *outbuf, int fgcolor, int bgcolor, int maxout); +char *term_color_code(char *outbuf, int fgcolor, int bgcolor, int maxout); -extern char *term_strip(char *outbuf, char *inbuf, int maxout); +char *term_strip(char *outbuf, char *inbuf, int maxout); -extern char *term_prompt(char *outbuf, const char *inbuf, int maxout); +char *term_prompt(char *outbuf, const char *inbuf, int maxout); -extern char *term_prep(void); +char *term_prep(void); -extern char *term_end(void); +char *term_end(void); -extern char *term_quit(void); +char *term_quit(void); #if defined(__cplusplus) || defined(c_plusplus) } |