[asterisk-commits] branch bweschke/queue_improvements r16664 - in
/team/bweschke/queue_improveme...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Fri Mar 31 06:23:43 MST 2006
Author: bweschke
Date: Fri Mar 31 07:23:39 2006
New Revision: 16664
URL: http://svn.digium.com/view/asterisk?rev=16664&view=rev
Log:
Merged revisions 16639-16640,16646,16650-16654 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r16639 | rizzo | 2006-03-31 03:50:54 -0600 (Fri, 31 Mar 2006) | 4 lines
minor code simplifications - no need to use temporary
variables.
........
r16640 | rizzo | 2006-03-31 03:53:05 -0600 (Fri, 31 Mar 2006) | 3 lines
fix formatting
........
r16646 | rizzo | 2006-03-31 04:02:52 -0600 (Fri, 31 Mar 2006) | 5 lines
remove useless 'extern' and trailing whitespace.
(this is a whitespace-only change)
........
r16650 | rizzo | 2006-03-31 04:06:42 -0600 (Fri, 31 Mar 2006) | 4 lines
another batch of whitespace removal
(trailing space-tabs, and useless 'extern')
........
r16651 | rizzo | 2006-03-31 04:11:10 -0600 (Fri, 31 Mar 2006) | 3 lines
useless 'extern' and trailing whitespace removal
........
r16652 | rizzo | 2006-03-31 04:13:22 -0600 (Fri, 31 Mar 2006) | 3 lines
minor cleanup: localize a variable and replace i++; i++ with i +=2;
........
r16653 | rizzo | 2006-03-31 04:29:50 -0600 (Fri, 31 Mar 2006) | 3 lines
removal of trailing whitespace and useless 'extern'
........
r16654 | rizzo | 2006-03-31 04:35:25 -0600 (Fri, 31 Mar 2006) | 3 lines
more trailing whitespace and extern removal
........
Modified:
team/bweschke/queue_improvements/ (props changed)
team/bweschke/queue_improvements/channels/chan_local.c
team/bweschke/queue_improvements/channels/iax2-provision.h
team/bweschke/queue_improvements/include/asterisk/adsi.h
team/bweschke/queue_improvements/include/asterisk/callerid.h
team/bweschke/queue_improvements/include/asterisk/cli.h
team/bweschke/queue_improvements/include/asterisk/crypto.h
team/bweschke/queue_improvements/include/asterisk/dns.h
team/bweschke/queue_improvements/include/asterisk/enum.h
team/bweschke/queue_improvements/include/asterisk/image.h
team/bweschke/queue_improvements/include/asterisk/io.h
team/bweschke/queue_improvements/include/asterisk/localtime.h
team/bweschke/queue_improvements/include/asterisk/logger.h
team/bweschke/queue_improvements/include/asterisk/manager.h
team/bweschke/queue_improvements/include/asterisk/musiconhold.h
team/bweschke/queue_improvements/include/asterisk/rtp.h
team/bweschke/queue_improvements/include/asterisk/sched.h
team/bweschke/queue_improvements/include/asterisk/term.h
team/bweschke/queue_improvements/pbx/pbx_loopback.c
team/bweschke/queue_improvements/pbx/pbx_realtime.c
Propchange: team/bweschke/queue_improvements/
------------------------------------------------------------------------------
automerge = *
Propchange: team/bweschke/queue_improvements/
------------------------------------------------------------------------------
automerge-email = bweschke at btwtech.com
Propchange: team/bweschke/queue_improvements/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Mar 31 07:23:39 2006
@@ -1,1 +1,1 @@
-/trunk:1-16625
+/trunk:1-16663
Modified: team/bweschke/queue_improvements/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/team/bweschke/queue_improvements/channels/chan_local.c?rev=16664&r1=16663&r2=16664&view=diff
==============================================================================
--- team/bweschke/queue_improvements/channels/chan_local.c (original)
+++ team/bweschke/queue_improvements/channels/chan_local.c Fri Mar 31 07:23:39 2006
@@ -382,12 +382,11 @@
struct ast_frame f = { AST_FRAME_CONTROL, AST_CONTROL_HANGUP };
struct ast_channel *ochan = NULL;
int glaredetect;
- const char *status;
ast_mutex_lock(&p->lock);
isoutbound = IS_OUTBOUND(ast, p);
if (isoutbound) {
- status = pbx_builtin_getvar_helper(p->chan, "DIALSTATUS");
+ const char *status = pbx_builtin_getvar_helper(p->chan, "DIALSTATUS");
if ((status) && (p->owner))
pbx_builtin_setvar_helper(p->owner, "CHANLOCALSTATUS", status);
p->chan = NULL;
@@ -512,8 +511,7 @@
p->owner = tmp;
p->chan = tmp2;
ast_mutex_lock(&usecnt_lock);
- usecnt++;
- usecnt++;
+ usecnt += 2; /* we allocate 2 new channels */
ast_mutex_unlock(&usecnt_lock);
ast_update_use_count();
ast_copy_string(tmp->context, p->context, sizeof(tmp->context));
Modified: team/bweschke/queue_improvements/channels/iax2-provision.h
URL: http://svn.digium.com/view/asterisk/team/bweschke/queue_improvements/channels/iax2-provision.h?rev=16664&r1=16663&r2=16664&view=diff
==============================================================================
--- team/bweschke/queue_improvements/channels/iax2-provision.h (original)
+++ team/bweschke/queue_improvements/channels/iax2-provision.h Fri Mar 31 07:23:39 2006
@@ -1,5 +1,5 @@
/*
- * IAX Provisioning Protocol
+ * IAX Provisioning Protocol
*
* Sub-information elements
*
@@ -45,9 +45,9 @@
#define PROV_FLAG_DIS_CIDCW (1 << 6) /* CID/CW Disabled */
#define PROV_FLAG_DIS_THREEWAY (1 << 7) /* Three-way calling, transfer disabled */
-extern char *iax_provflags2str(char *buf, int buflen, unsigned int flags);
-extern int iax_provision_reload(void);
-extern int iax_provision_unload(void);
-extern int iax_provision_build(struct iax_ie_data *provdata, unsigned int *signature, const char *template, int force);
-extern int iax_provision_version(unsigned int *signature, const char *template, int force);
-extern char *iax_prov_complete_template(const char *line, const char *word, int pos, int state);
+char *iax_provflags2str(char *buf, int buflen, unsigned int flags);
+int iax_provision_reload(void);
+int iax_provision_unload(void);
+int iax_provision_build(struct iax_ie_data *provdata, unsigned int *signature, const char *template, int force);
+int iax_provision_version(unsigned int *signature, const char *template, int force);
+char *iax_prov_complete_template(const char *line, const char *word, int pos, int state);
Modified: team/bweschke/queue_improvements/include/asterisk/adsi.h
URL: http://svn.digium.com/view/asterisk/team/bweschke/queue_improvements/include/asterisk/adsi.h?rev=16664&r1=16663&r2=16664&view=diff
==============================================================================
--- team/bweschke/queue_improvements/include/asterisk/adsi.h (original)
+++ team/bweschke/queue_improvements/include/asterisk/adsi.h Fri Mar 31 07:23:39 2006
@@ -17,7 +17,7 @@
*/
/*! \file
- * \brief ADSI Support (built upon Caller*ID)
+ * \brief ADSI Support (built upon Caller*ID)
*/
#ifndef _ASTERISK_ADSI_H
@@ -118,29 +118,29 @@
#define ADSI_DIR_FROM_RIGHT (1)
/*! Perform Asterisk ADSI initialization (for channel drivers that want */
-/* to support ADSI when the handset is first lifted) */
-/*!
+/* to support ADSI when the handset is first lifted) */
+/*!
* \param chan Channel to initialize for ADSI (if supported)
- *
+ *
* Returns 0 on success (or adsi unavailable) and -1 on hangup
- *
- */
-extern int adsi_channel_init(struct ast_channel *chan);
-
-extern int adsi_begin_download(struct ast_channel *chan, char *service, unsigned char *fdn, unsigned char *sec, int version);
-
-extern int adsi_end_download(struct ast_channel *chan);
+ *
+ */
+int adsi_channel_init(struct ast_channel *chan);
+
+int adsi_begin_download(struct ast_channel *chan, char *service, unsigned char *fdn, unsigned char *sec, int version);
+
+int adsi_end_download(struct ast_channel *chan);
/*! Restore ADSI initialization (for applications that play with ADSI */
/* and want to restore it to normal. If you touch "INFO" then you */
/* have to use the adsi_channel_init again instead. */
/*!
* \param chan Channel to restore
- *
+ *
* Returns 0 on success (or adsi unavailable) and -1 on hangup
*
*/
-extern int adsi_channel_restore(struct ast_channel *chan);
+int adsi_channel_restore(struct ast_channel *chan);
/*! Display some stuff on the screen */
/*!
@@ -152,7 +152,7 @@
* Return 0 on success (or adsi unavailable) and -1 on hangup
*
*/
-extern int adsi_print(struct ast_channel *chan, char **lines, int *align, int voice);
+int adsi_print(struct ast_channel *chan, char **lines, int *align, int voice);
/*! Check if scripts for a given app are already loaded. Version may be -1 */
/* if any version is okay, or 0-255 for a specific version. */
@@ -165,22 +165,22 @@
* Returns 0 if scripts is not loaded or not an ADSI CPE. Returns -1
* on hangup. Returns 1 if script already loaded.
*/
-extern int adsi_load_session(struct ast_channel *chan, unsigned char *app, int ver, int data);
-extern int adsi_unload_session(struct ast_channel *chan);
+int adsi_load_session(struct ast_channel *chan, unsigned char *app, int ver, int data);
+int adsi_unload_session(struct ast_channel *chan);
/* ADSI Layer 2 transmission functions */
-extern int adsi_transmit_messages(struct ast_channel *chan, unsigned char **msg, int *msglen, int *msgtype);
-extern int adsi_transmit_message(struct ast_channel *chan, unsigned char *msg, int msglen, int msgtype);
-extern int adsi_transmit_message_full(struct ast_channel *chan, unsigned char *msg, int msglen, int msgtype, int dowait);
+int adsi_transmit_messages(struct ast_channel *chan, unsigned char **msg, int *msglen, int *msgtype);
+int adsi_transmit_message(struct ast_channel *chan, unsigned char *msg, int msglen, int msgtype);
+int adsi_transmit_message_full(struct ast_channel *chan, unsigned char *msg, int msglen, int msgtype, int dowait);
/*! Read some encoded DTMF data. */
/*!
* Returns number of bytes received
*/
-extern int adsi_read_encoded_dtmf(struct ast_channel *chan, unsigned char *buf, int maxlen);
+int adsi_read_encoded_dtmf(struct ast_channel *chan, unsigned char *buf, int maxlen);
/* ADSI Layer 3 creation functions */
-/*! Connects an ADSI Display Session */
+/*! Connects an ADSI Display Session */
/*!
* \param buf Character buffer to create parameter in (must have at least 256 free)
* \param fdn Optional 4 byte Feature Download Number (for loading soft keys)
@@ -190,14 +190,14 @@
*
*/
-extern int adsi_connect_session(unsigned char *buf, unsigned char *fdn, int ver);
-
-/*! Build Query CPE ID of equipment */
+int adsi_connect_session(unsigned char *buf, unsigned char *fdn, int ver);
+
+/*! Build Query CPE ID of equipment */
/*!
* Returns number of bytes added to message
*/
-extern int adsi_query_cpeid(unsigned char *buf);
-extern int adsi_query_cpeinfo(unsigned char *buf);
+int adsi_query_cpeid(unsigned char *buf);
+int adsi_query_cpeinfo(unsigned char *buf);
/*! Get CPE ID from an attached ADSI compatible CPE. */
/*!
@@ -205,11 +205,11 @@
* or -1 on hangup, or 0 if there was no hangup but it failed to find the
* device ID. Returns to voice mode if "voice" is non-zero.
*/
-extern int adsi_get_cpeid(struct ast_channel *chan, unsigned char *cpeid, int voice);
-
-extern int adsi_get_cpeinfo(struct ast_channel *chan, int *width, int *height, int *buttons, int voice);
-
-/*! Begin an ADSI script download */
+int adsi_get_cpeid(struct ast_channel *chan, unsigned char *cpeid, int voice);
+
+int adsi_get_cpeinfo(struct ast_channel *chan, int *width, int *height, int *buttons, int voice);
+
+/*! Begin an ADSI script download */
/*!
* \param buf Character buffer to create parameter in (must have at least 256 free)
* \param service a 1-18 byte name of the feature
@@ -221,7 +221,7 @@
*
*/
-extern int adsi_download_connect(unsigned char *buf, char *service, unsigned char *fdn, unsigned char *sec, int ver);
+int adsi_download_connect(unsigned char *buf, char *service, unsigned char *fdn, unsigned char *sec, int ver);
/*! Disconnects a running session */
/*!
@@ -230,7 +230,7 @@
* Returns number of bytes added to buffer or -1 on error.
*
*/
-extern int adsi_disconnect_session(unsigned char *buf);
+int adsi_disconnect_session(unsigned char *buf);
/*! Disconnects (and hopefully saves) a downloaded script */
/*!
@@ -239,7 +239,7 @@
* Returns number of bytes added to buffer or -1 on error.
*
*/
-extern int adsi_download_disconnect(unsigned char *buf);
+int adsi_download_disconnect(unsigned char *buf);
/*! Puts CPE in data mode... */
/*!
@@ -248,9 +248,9 @@
* Returns number of bytes added to buffer or -1 on error.
*
*/
-extern int adsi_data_mode(unsigned char *buf);
-extern int adsi_clear_soft_keys(unsigned char *buf);
-extern int adsi_clear_screen(unsigned char *buf);
+int adsi_data_mode(unsigned char *buf);
+int adsi_clear_soft_keys(unsigned char *buf);
+int adsi_clear_screen(unsigned char *buf);
/*! Puts CPE in voice mode... */
/*!
@@ -260,16 +260,16 @@
* Returns number of bytes added to buffer or -1 on error.
*
*/
-extern int adsi_voice_mode(unsigned char *buf, int when);
+int adsi_voice_mode(unsigned char *buf, int when);
/*! Returns non-zero if Channel does or might support ADSI */
/*!
* \param chan Channel to check
*
*/
-extern int adsi_available(struct ast_channel *chan);
-
-/*! Loads a line of info into the display */
+int adsi_available(struct ast_channel *chan);
+
+/*! Loads a line of info into the display */
/*!
* \param buf Character buffer to create parameter in (must have at least 256 free)
* \param page Page to load (ADSI_COMM_PAGE or ADSI_INFO_PAGE)
@@ -283,9 +283,9 @@
*
*/
-extern int adsi_display(unsigned char *buf, int page, int line, int just, int wrap, char *col1, char *col2);
-
-/*! Sets the current line and page */
+int adsi_display(unsigned char *buf, int page, int line, int just, int wrap, char *col1, char *col2);
+
+/*! Sets the current line and page */
/*!
* \param buf Character buffer to create parameter in (must have at least 256 free)
* \param page Which page (ADSI_COMM_PAGE or ADSI_INFO_PAGE)
@@ -295,10 +295,10 @@
*
*/
-extern int adsi_set_line(unsigned char *buf, int page, int line);
+int adsi_set_line(unsigned char *buf, int page, int line);
/*! Creates "load soft key" parameters */
-/*!
+/*!
* \param buf Character buffer to create parameter in (must have at least 256 free)
* \param key Key code from 2 to 33, for which key we are loading
* \param llabel Long label for key (1-18 bytes)
@@ -309,7 +309,7 @@
* Returns number of bytes added to buffer or -1 on error.
*
*/
-extern int adsi_load_soft_key(unsigned char *buf, int key, char *llabel, char *slabel, char *ret, int data);
+int adsi_load_soft_key(unsigned char *buf, int key, char *llabel, char *slabel, char *ret, int data);
/*! Set which soft keys should be displayed */
/*!
@@ -320,7 +320,7 @@
* Returns number of bytes added to buffer or -1 on error.
*
*/
-extern int adsi_set_keys(unsigned char *buf, unsigned char *keys);
+int adsi_set_keys(unsigned char *buf, unsigned char *keys);
/*! Set input information */
/*!
@@ -334,7 +334,7 @@
* Returns number of bytes added to buffer or -1 on error.
*
*/
-extern int adsi_input_control(unsigned char *buf, int page, int line, int display, int format, int just);
+int adsi_input_control(unsigned char *buf, int page, int line, int display, int format, int just);
/*! Set input format */
/*!
@@ -348,6 +348,6 @@
* Returns number of bytes added to buffer or -1 on error.
*
*/
-extern int adsi_input_format(unsigned char *buf, int num, int dir, int wrap, char *format1, char *format2);
+int adsi_input_format(unsigned char *buf, int num, int dir, int wrap, char *format1, char *format2);
#endif /* _ASTERISK_ADSI_H */
Modified: team/bweschke/queue_improvements/include/asterisk/callerid.h
URL: http://svn.digium.com/view/asterisk/team/bweschke/queue_improvements/include/asterisk/callerid.h?rev=16664&r1=16663&r2=16664&view=diff
==============================================================================
--- team/bweschke/queue_improvements/include/asterisk/callerid.h (original)
+++ team/bweschke/queue_improvements/include/asterisk/callerid.h Fri Mar 31 07:23:39 2006
@@ -73,28 +73,28 @@
* \par
* Initializes the callerid system. Mostly stuff for inverse FFT
*/
-extern void callerid_init(void);
-
-/*! \brief Generates a CallerID FSK stream in ulaw format suitable for transmission.
+void callerid_init(void);
+
+/*! \brief Generates a CallerID FSK stream in ulaw format suitable for transmission.
* \param buf Buffer to use. If "buf" is supplied, it will use that buffer instead of allocating its own. "buf" must be at least 32000 bytes in size of you want to be sure you don't have an overrun.
* \param number Use NULL for no number or "P" for "private"
* \param name name to be used
* \param flags passed flags
* \param callwaiting callwaiting flag
* \param codec -- either AST_FORMAT_ULAW or AST_FORMAT_ALAW
- * This function creates a stream of callerid (a callerid spill) data in ulaw format.
+ * This function creates a stream of callerid (a callerid spill) data in ulaw format.
* \return It returns the size
* (in bytes) of the data (if it returns a size of 0, there is probably an error)
*/
-extern int callerid_generate(unsigned char *buf, char *number, char *name, int flags, int callwaiting, int codec);
-
-/*! \brief Create a callerID state machine
+int callerid_generate(unsigned char *buf, char *number, char *name, int flags, int callwaiting, int codec);
+
+/*! \brief Create a callerID state machine
* \param cid_signalling Type of signalling in use
*
* This function returns a malloc'd instance of the callerid_state data structure.
* \return Returns a pointer to a malloc'd callerid_state structure, or NULL on error.
*/
-extern struct callerid_state *callerid_new(int cid_signalling);
+struct callerid_state *callerid_new(int cid_signalling);
/*! \brief Read samples into the state machine.
* \param cid Which state machine to act upon
@@ -103,10 +103,10 @@
* \param codec which codec (AST_FORMAT_ALAW or AST_FORMAT_ULAW)
*
* Send received audio to the Caller*ID demodulator.
- * \return Returns -1 on error, 0 for "needs more samples",
+ * \return Returns -1 on error, 0 for "needs more samples",
* and 1 if the CallerID spill reception is complete.
*/
-extern int callerid_feed(struct callerid_state *cid, unsigned char *ubuf, int samples, int codec);
+int callerid_feed(struct callerid_state *cid, unsigned char *ubuf, int samples, int codec);
/*! \brief Read samples into the state machine.
* \param cid Which state machine to act upon
@@ -115,12 +115,12 @@
* \param codec which codec (AST_FORMAT_ALAW or AST_FORMAT_ULAW)
*
* Send received audio to the Caller*ID demodulator (for japanese style lines).
- * \return Returns -1 on error, 0 for "needs more samples",
+ * \return Returns -1 on error, 0 for "needs more samples",
* and 1 if the CallerID spill reception is complete.
*/
-extern int callerid_feed_jp(struct callerid_state *cid, unsigned char *ubuf, int samples, int codec);
-
-/*! \brief Extract info out of callerID state machine. Flags are listed above
+int callerid_feed_jp(struct callerid_state *cid, unsigned char *ubuf, int samples, int codec);
+
+/*! \brief Extract info out of callerID state machine. Flags are listed above
* \param cid Callerid state machine to act upon
* \param number Pass the address of a pointer-to-char (will contain the phone number)
* \param name Pass the address of a pointer-to-char (will contain the name)
@@ -129,7 +129,7 @@
* This function extracts a callerid string out of a callerid_state state machine.
* If no number is found, *number will be set to NULL. Likewise for the name.
* Flags can contain any of the following:
- *
+ *
* \return Returns nothing.
*/
void callerid_get(struct callerid_state *cid, char **number, char **name, int *flags);
@@ -147,9 +147,9 @@
* \param cid This is the callerid_state state machine to free
* This function frees callerid_state cid.
*/
-extern void callerid_free(struct callerid_state *cid);
-
-/*! \brief Generate Caller-ID spill from the "callerid" field of asterisk (in e-mail address like format)
+void callerid_free(struct callerid_state *cid);
+
+/*! \brief Generate Caller-ID spill from the "callerid" field of asterisk (in e-mail address like format)
* \param buf buffer for output samples. See callerid_generate() for details regarding buffer.
* \param name Caller-ID Name
* \param number Caller-ID Number
@@ -157,24 +157,24 @@
*
* Acts like callerid_generate except uses an asterisk format callerid string.
*/
-extern int ast_callerid_generate(unsigned char *buf, char *name, char *number, int codec);
+int ast_callerid_generate(unsigned char *buf, char *name, char *number, int codec);
/*! \brief Generate message waiting indicator (stutter tone) */
-extern int vmwi_generate(unsigned char *buf, int active, int mdmf, int codec);
-
-/*! \brief Generate Caller-ID spill but in a format suitable for Call Waiting(tm)'s Caller*ID(tm)
+int vmwi_generate(unsigned char *buf, int active, int mdmf, int codec);
+
+/*! \brief Generate Caller-ID spill but in a format suitable for Call Waiting(tm)'s Caller*ID(tm)
* See ast_callerid_generate() for other details
*/
-extern int ast_callerid_callwaiting_generate(unsigned char *buf, char *name, char *number, int codec);
-
-/*! \brief Destructively parse inbuf into name and location (or number)
+int ast_callerid_callwaiting_generate(unsigned char *buf, char *name, char *number, int codec);
+
+/*! \brief Destructively parse inbuf into name and location (or number)
* Parses callerid stream from inbuf and changes into useable form, outputed in name and location.
* \param instr buffer of callerid stream (in audio form) to be parsed. Warning, data in buffer is changed.
* \param name address of a pointer-to-char for the name value of the stream.
* \param location address of a pointer-to-char for the phone number value of the stream.
* \return Returns 0 on success, -1 on failure.
*/
-extern int ast_callerid_parse(char *instr, char **name, char **location);
+int ast_callerid_parse(char *instr, char **name, char **location);
/*! Generate a CAS (CPE Alert Signal) tone for 'n' samples */
/*!
@@ -184,31 +184,31 @@
* \param codec Which codec (AST_FORMAT_ALAW or AST_FORMAT_ULAW)
* \return Returns -1 on error (if len is less than 2400), 0 on success.
*/
-extern int ast_gen_cas(unsigned char *outbuf, int sas, int len, int codec);
+int ast_gen_cas(unsigned char *outbuf, int sas, int len, int codec);
/*! \brief Shrink a phone number in place to just digits (more accurately it just removes ()'s, .'s, and -'s... */
/*!
* \param n The number to be stripped/shrunk
* \return Returns nothing important
*/
-extern void ast_shrink_phone_number(char *n);
+void ast_shrink_phone_number(char *n);
/*! \brief Check if a string consists only of digits and + \#
\param n number to be checked.
\return Returns 0 if n is a number, 1 if it's not.
*/
-extern int ast_isphonenumber(const char *n);
+int ast_isphonenumber(const char *n);
/*! \brief Check if a string consists only of digits and and + \# ( ) - .
(meaning it can be cleaned with ast_shrink_phone_number)
\param exten The extension (or URI) to be checked.
\return Returns 0 if n is a number, 1 if it's not.
*/
-extern int ast_is_shrinkable_phonenumber(const char *exten);
-
-extern int ast_callerid_split(const char *src, char *name, int namelen, char *num, int numlen);
-
-extern char *ast_callerid_merge(char *buf, int bufsiz, const char *name, const char *num, const char *unknown);
+int ast_is_shrinkable_phonenumber(const char *exten);
+
+int ast_callerid_split(const char *src, char *name, int namelen, char *num, int numlen);
+
+char *ast_callerid_merge(char *buf, int bufsiz, const char *name, const char *num, const char *unknown);
/*
* Caller*ID and other GR-30 compatible generation
@@ -226,12 +226,12 @@
t = *cr * cid_dr[bit] - *ci * cid_di[bit];
*ci = *cr * cid_di[bit] + *ci * cid_dr[bit];
*cr = t;
-
+
t = 2.0 - (*cr * *cr + *ci * *ci);
*cr *= t;
*ci *= t;
return *cr;
-}
+}
#define PUT_BYTE(a) do { \
*(buf++) = (a); \
@@ -243,7 +243,7 @@
*(buf++) = AST_LIN2X(index); \
bytes++; \
} while(0)
-
+
#define PUT_CLID_MARKMS do { \
int x; \
for (x=0;x<8;x++) \
@@ -268,7 +268,7 @@
b >>= 1; \
} \
PUT_CLID_BAUD(1); /* Stop bit */ \
-} while(0);
+} while(0)
/* Various defines and bits for handling PRI- and SS7-type restriction */
@@ -316,7 +316,7 @@
/*! \page Def_CallerPres Caller ID Presentation
- Caller ID presentation values are used to set properties to a
+ Caller ID presentation values are used to set properties to a
caller ID in PSTN networks, and as RPID value in SIP transactions.
The following values are available to use:
Modified: team/bweschke/queue_improvements/include/asterisk/cli.h
URL: http://svn.digium.com/view/asterisk/team/bweschke/queue_improvements/include/asterisk/cli.h?rev=16664&r1=16663&r2=16664&view=diff
==============================================================================
--- team/bweschke/queue_improvements/include/asterisk/cli.h (original)
+++ team/bweschke/queue_improvements/include/asterisk/cli.h Fri Mar 31 07:23:39 2006
@@ -44,7 +44,7 @@
#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 @@
*/
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 @@
*/
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 @@
/*!
* \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
Modified: team/bweschke/queue_improvements/include/asterisk/crypto.h
URL: http://svn.digium.com/view/asterisk/team/bweschke/queue_improvements/include/asterisk/crypto.h?rev=16664&r1=16663&r2=16664&view=diff
==============================================================================
--- team/bweschke/queue_improvements/include/asterisk/crypto.h (original)
+++ team/bweschke/queue_improvements/include/asterisk/crypto.h Fri Mar 31 07:23:39 2006
@@ -32,15 +32,15 @@
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 @@
* 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 @@
* 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 @@
* 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 @@
* 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 @@
* 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 @@
* 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
Modified: team/bweschke/queue_improvements/include/asterisk/dns.h
URL: http://svn.digium.com/view/asterisk/team/bweschke/queue_improvements/include/asterisk/dns.h?rev=16664&r1=16663&r2=16664&view=diff
==============================================================================
--- team/bweschke/queue_improvements/include/asterisk/dns.h (original)
+++ team/bweschke/queue_improvements/include/asterisk/dns.h Fri Mar 31 07:23:39 2006
@@ -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 @@
\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 */
Modified: team/bweschke/queue_improvements/include/asterisk/enum.h
URL: http://svn.digium.com/view/asterisk/team/bweschke/queue_improvements/include/asterisk/enum.h?rev=16664&r1=16663&r2=16664&view=diff
==============================================================================
--- team/bweschke/queue_improvements/include/asterisk/enum.h (original)
+++ team/bweschke/queue_improvements/include/asterisk/enum.h Fri Mar 31 07:23:39 2006
@@ -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 @@
\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 */
Modified: team/bweschke/queue_improvements/include/asterisk/image.h
URL: http://svn.digium.com/view/asterisk/team/bweschke/queue_improvements/include/asterisk/image.h?rev=16664&r1=16663&r2=16664&view=diff
==============================================================================
--- team/bweschke/queue_improvements/include/asterisk/image.h (original)
+++ team/bweschke/queue_improvements/include/asterisk/image.h Fri Mar 31 07:23:39 2006
@@ -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 @@
* 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 @@
* 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 */
Modified: team/bweschke/queue_improvements/include/asterisk/io.h
URL: http://svn.digium.com/view/asterisk/team/bweschke/queue_improvements/include/asterisk/io.h?rev=16664&r1=16663&r2=16664&view=diff
==============================================================================
--- team/bweschke/queue_improvements/include/asterisk/io.h (original)
+++ team/bweschke/queue_improvements/include/asterisk/io.h Fri Mar 31 07:23:39 2006
@@ -62,7 +62,7 @@
* 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 @@
* 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 @@
* 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 @@
* any necessary I/O. Returns the number of
* I/O events which took place.
*/
[... 502 lines stripped ...]
More information about the asterisk-commits
mailing list