changeset 2638 . callweaver

Changeset 2638

Changeset index | Previous changeset | Next changeset

Cleaned up various leftover references to Asterisk

Committed by: coppice

Date: Apr 22 2007 * 08:13 (about 1 year ago)

Affected files:

callweaver/trunk/contrib/scripts/lookup.ogi (from callweaver/trunk/contrib/scripts/lookup.agi:2635)
callweaver/trunk/cdr/cdr_csv.c (diff)
callweaver/trunk/cdr/cdr_sqlite3.c (diff)
callweaver/trunk/include/callweaver/ast_expr.h (diff)
callweaver/trunk/include/callweaver/callerid.h (diff)
callweaver/trunk/include/callweaver/channel.h (diff)
callweaver/trunk/include/callweaver/generic_jb.h (diff)
callweaver/trunk/include/callweaver/icd/app_icd.h (diff)
callweaver/trunk/include/callweaver/rtp.h (diff)
callweaver/trunk/include/callweaver/udptl.h (diff)
callweaver/trunk/include/callweaver/utils.h (diff)
callweaver/trunk/pbx/ael/ael.tab.c (diff)
callweaver/trunk/pbx/ael/ael.y (diff)
callweaver/trunk/pbx/ael/ael_lex.c (diff)
callweaver/trunk/pbx/pbx_ael.c (diff)

callweaver/trunk/cdr/cdr_csv.c (unified diff)

r2615	r2638
22	22	*
23	23	* \brief Comma Separated Value CDR records.
24	24	*
25		* \arg See also \ref AstCDR
	25	* \arg See also \ref opbxCDR
26	26	*/
27	27	#ifdef HAVE_CONFIG_H
28	28	#include "confdefs.h"

callweaver/trunk/cdr/cdr_sqlite3.c (unified diff)

r2627	r2638
1	1	/*
2		* Asterisk -- An open source telephony toolkit.
	2	* CallWeaver -- An open source telephony toolkit.
3	3	*
4	4	* Copyright (C) 2004 - 2005, Holger Schurig
5	5	*
6	6	*
7	7	* Ideas taken from other cdr_*.c files
8	8	*
9		* See http://www.asterisk.org for more information about
10		* the Asterisk project. Please do not directly contact
	9	* See http://www.callweaver.org for more information about
	10	* the CallWeaver project. Please do not directly contact
11	11	* any of the maintainers of this project for assistance;
12	12	* the project provides a web site, mailing lists and IRC
13	13	* channels for your use.

callweaver/trunk/include/callweaver/ast_expr.h (unified diff)

r1676	r2638
1	1	/*
2		* Asterisk -- An open source telephony toolkit.
	2	* CallWeaver -- An open source telephony toolkit.
3	3	*
4	4	* Copyright (C) 1999 - 2005, Digium, Inc.
5	5	*
---	---
16	16	* at the top of the source tree.
17	17	*/
18	18
19		#ifndef _ASTERISK_EXPR_H
20		#define _ASTERISK_EXPR_H
	19	#ifndef _CALLWEAVER_AST_EXPR_H
	20	#define _CALLWEAVER_AST_EXPR_H
21	21
22	22	#if defined(__cplusplus) \|\| defined(c_plusplus)
23	23	extern "C" {
---	---
29	29	}
30	30	#endif
31	31
32		#endif /* _ASTERISK_EXPR_H */
	32	#endif

callweaver/trunk/include/callweaver/callerid.h (unified diff)

r1676	r2638
1	1	/*
2		* Asterisk -- An open source telephony toolkit.
	2	* CallWeaver -- An open source telephony toolkit.
3	3	*
4	4	* Copyright (C) 1999 - 2005, Digium, Inc.
5	5	*
6	6	* Mark Spencer <markster@digium.com>
7	7	*
8		* See http://www.asterisk.org for more information about
9		* the Asterisk project. Please do not directly contact
	8	* See http://www.callweaver.org for more information about
	9	* the CallWeaver project. Please do not directly contact
10	10	* any of the maintainers of this project for assistance;
11	11	* the project provides a web site, mailing lists and IRC
12	12	* channels for your use.
---	---
32	32	* On ISDN Caller ID names are 7 bit, Almost ASCII
33	33	* (See http://www.zytrax.com/tech/ia5.html )
34	34	*
35		* \note Asterisk does not currently support SIP utf8 caller ID names or caller ID's.
	35	* \note CallWeaver does not currently support SIP utf8 caller ID names or caller ID's.
36	36	*
37	37	* \par See also
38	38	* \arg \ref callerid.c
---	---
40	40	* \arg \ref Def_CallerPres
41	41	*/
42	42
43		#ifndef _ASTERISK_CALLERID_H
44		#define _ASTERISK_CALLERID_H
	43	#ifndef _CALLWEAVER_CALLERID_H
	44	#define _CALLWEAVER_CALLERID_H
45	45
46	46	#define MAX_CALLERID_SIZE 32000
47	47
---	---
60	60	#define CID_START_POLARITY 2
61	61
62	62
63		#define AST_LIN2X(a) ((codec == AST_FORMAT_ALAW) ? (AST_LIN2A(a)) : (AST_LIN2MU(a)))
64		#define AST_XLAW(a) ((codec == AST_FORMAT_ALAW) ? (AST_ALAW(a)) : (AST_MULAW(a)))
	63	#define OPBX_LIN2X(a) ((codec == OPBX_FORMAT_ALAW) ? (OPBX_LIN2A(a)) : (OPBX_LIN2MU(a)))
	64	#define OPBX_XLAW(a) ((codec == OPBX_FORMAT_ALAW) ? (OPBX_ALAW(a)) : (OPBX_MULAW(a)))
65	65
66	66
67	67	struct callerid_state;
---	---
79	79	* \param name name to be used
80	80	* \param flags passed flags
81	81	* \param callwaiting callwaiting flag
82		* \param codec -- either AST_FORMAT_ULAW or AST_FORMAT_ALAW
	82	* \param codec -- either OPBX_FORMAT_ULAW or OPBX_FORMAT_ALAW
83	83	* This function creates a stream of callerid (a callerid spill) data in ulaw format.
84	84	* \return It returns the size
85	85	* (in bytes) of the data (if it returns a size of 0, there is probably an error)
---	---
98	98	* \param cid Which state machine to act upon
99	99	* \param ubuf containing your samples
100	100	* \param samples number of samples contained within the buffer.
101		* \param codec which codec (AST_FORMAT_ALAW or AST_FORMAT_ULAW)
	101	* \param codec which codec (OPBX_FORMAT_ALAW or OPBX_FORMAT_ULAW)
102	102	*
103	103	* Send received audio to the Caller*ID demodulator.
104	104	* \return Returns -1 on error, 0 for "needs more samples",
---	---
110	110	* \param cid Which state machine to act upon
111	111	* \param ubuf containing your samples
112	112	* \param samples number of samples contained within the buffer.
113		* \param codec which codec (AST_FORMAT_ALAW or AST_FORMAT_ULAW)
	113	* \param codec which codec (OPBX_FORMAT_ALAW or OPBX_FORMAT_ULAW)
114	114	*
115	115	* Send received audio to the Caller*ID demodulator (for japanese style lines).
116	116	* \return Returns -1 on error, 0 for "needs more samples",
---	---
147	147	*/
148	148	void callerid_free(struct callerid_state *cid);
149	149
150		/*! \brief Generate Caller-ID spill from the "callerid" field of asterisk (in e-mail address like format)
	150	/*! \brief Generate Caller-ID spill from the "callerid" field of CallWeaver (in e-mail address like format)
151	151	* \param buf buffer for output samples. See callerid_generate() for details regarding buffer.
152	152	* \param name Caller-ID Name
153	153	* \param number Caller-ID Number
154		* \param codec Asterisk codec (either AST_FORMAT_ALAW or AST_FORMAT_ULAW)
	154	* \param codec CallWeaver codec (either OPBX_FORMAT_ALAW or OPBX_FORMAT_ULAW)
155	155	*
156		* Acts like callerid_generate except uses an asterisk format callerid string.
	156	* Acts like callerid_generate except uses an CallWeaver format callerid string.
157	157	*/
158		int ast_callerid_generate(unsigned char buf, const char name, const char *number, int codec);
	158	int OPBX_callerid_generate(unsigned char buf, const char name, const char *number, int codec);
159	159
160	160	/! \brief Generate message waiting indicator (stutter tone) /
161	161	int vmwi_generate(unsigned char *buf, int active, int mdmf, int codec);
162	162
163	163	/! \brief Generate Caller-ID spill but in a format suitable for Call Waiting(tm)'s CallerID(tm)
164		* See ast_callerid_generate() for other details
	164	* See OPBX_callerid_generate() for other details
165	165	*/
166		int ast_callerid_callwaiting_generate(unsigned char buf, const char name, const char *number, int codec);
	166	int OPBX_callerid_callwaiting_generate(unsigned char buf, const char name, const char *number, int codec);
167	167
168	168	/*! \brief Destructively parse inbuf into name and location (or number)
169	169	* Parses callerid stream from inbuf and changes into useable form, outputed in name and location.
---	---
172	172	* \param location address of a pointer-to-char for the phone number value of the stream.
173	173	* \return Returns 0 on success, -1 on failure.
174	174	*/
175		int ast_callerid_parse(char instr, char name, char *location);
	175	int OPBX_callerid_parse(char instr, char name, char *location);
176	176
177	177	/! Generate a CAS (CPE Alert Signal) tone for 'n' samples /
178	178	/*!
179	179	* \param outbuf Allocated buffer for data. Must be at least 2400 bytes unless no SAS is desired
180	180	* \param sas Non-zero if CAS should be preceeded by SAS
181	181	* \param len How many samples to generate.
182		* \param codec Which codec (AST_FORMAT_ALAW or AST_FORMAT_ULAW)
	182	* \param codec Which codec (OPBX_FORMAT_ALAW or OPBX_FORMAT_ULAW)
183	183	* \return Returns -1 on error (if len is less than 2400), 0 on success.
184	184	*/
185		int ast_gen_cas(unsigned char *outbuf, int sas, int len, int codec);
	185	int OPBX_gen_cas(unsigned char *outbuf, int sas, int len, int codec);
186	186
187	187	/! \brief Shrink a phone number in place to just digits (more accurately it just removes ()'s, .'s, and -'s... /
188	188	/*!
189	189	* \param n The number to be stripped/shrunk
190	190	* \return Returns nothing important
191	191	*/
192		void ast_shrink_phone_number(char *n);
	192	void OPBX_shrink_phone_number(char *n);
193	193
194	194	/*! \brief Check if a string consists only of digits and + \#
195	195	\param n number to be checked.
196	196	\return Returns 0 if n is a number, 1 if it's not.
197	197	*/
198		int ast_isphonenumber(const char *n);
	198	int OPBX_isphonenumber(const char *n);
199	199
200	200	/*! \brief Check if a string consists only of digits and and + \# ( ) - .
201		(meaning it can be cleaned with ast_shrink_phone_number)
	201	(meaning it can be cleaned with OPBX_shrink_phone_number)
202	202	\param exten The extension (or URI) to be checked.
203	203	\return Returns 0 if n is a number, 1 if it's not.
204	204	*/
205		int ast_is_shrinkable_phonenumber(const char *exten);
	205	int OPBX_is_shrinkable_phonenumber(const char *exten);
206	206
207		int ast_callerid_split(const char src, char name, int namelen, char *num, int numlen);
	207	int OPBX_callerid_split(const char src, char name, int namelen, char *num, int numlen);
208	208
209		char ast_callerid_merge(char buf, int bufsiz, const char name, const char num, const char *unknown);
	209	char OPBX_callerid_merge(char buf, int bufsiz, const char name, const char num, const char *unknown);
210	210
211	211	/*
212	212	* Caller*ID and other GR-30 compatible generation
---	---
238	238
239	239	#define PUT_AUDIO_SAMPLE(y) do { \
240	240	int index = (short)(rint(8192.0 * (y))); \
241		*(buf++) = AST_LIN2X(index); \
	241	*(buf++) = OPBX_LIN2X(index); \
242	242	bytes++; \
243	243	} while(0)
244	244
---	---
270	270
271	271	/* Various defines and bits for handling PRI- and SS7-type restriction */
272	272
273		#define AST_PRES_NUMBER_TYPE 0x03
274		#define AST_PRES_USER_NUMBER_UNSCREENED 0x00
275		#define AST_PRES_USER_NUMBER_PASSED_SCREEN 0x01
276		#define AST_PRES_USER_NUMBER_FAILED_SCREEN 0x02
277		#define AST_PRES_NETWORK_NUMBER 0x03
	273	#define OPBX_PRES_NUMBER_TYPE 0x03
	274	#define OPBX_PRES_USER_NUMBER_UNSCREENED 0x00
	275	#define OPBX_PRES_USER_NUMBER_PASSED_SCREEN 0x01
	276	#define OPBX_PRES_USER_NUMBER_FAILED_SCREEN 0x02
	277	#define OPBX_PRES_NETWORK_NUMBER 0x03
278	278
279		#define AST_PRES_RESTRICTION 0x60
280		#define AST_PRES_ALLOWED 0x00
281		#define AST_PRES_RESTRICTED 0x20
282		#define AST_PRES_UNAVAILABLE 0x40
283		#define AST_PRES_RESERVED 0x60
	279	#define OPBX_PRES_RESTRICTION 0x60
	280	#define OPBX_PRES_ALLOWED 0x00
	281	#define OPBX_PRES_RESTRICTED 0x20
	282	#define OPBX_PRES_UNAVAILABLE 0x40
	283	#define OPBX_PRES_RESERVED 0x60
284	284
285		#define AST_PRES_ALLOWED_USER_NUMBER_NOT_SCREENED \
286		AST_PRES_USER_NUMBER_UNSCREENED + AST_PRES_ALLOWED
	285	#define OPBX_PRES_ALLOWED_USER_NUMBER_NOT_SCREENED \
	286	OPBX_PRES_USER_NUMBER_UNSCREENED + OPBX_PRES_ALLOWED
287	287
288		#define AST_PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN \
289		AST_PRES_USER_NUMBER_PASSED_SCREEN + AST_PRES_ALLOWED
	288	#define OPBX_PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN \
	289	OPBX_PRES_USER_NUMBER_PASSED_SCREEN + OPBX_PRES_ALLOWED
290	290
291		#define AST_PRES_ALLOWED_USER_NUMBER_FAILED_SCREEN \
292		AST_PRES_USER_NUMBER_FAILED_SCREEN + AST_PRES_ALLOWED
	291	#define OPBX_PRES_ALLOWED_USER_NUMBER_FAILED_SCREEN \
	292	OPBX_PRES_USER_NUMBER_FAILED_SCREEN + OPBX_PRES_ALLOWED
293	293
294		#define AST_PRES_ALLOWED_NETWORK_NUMBER \
295		AST_PRES_NETWORK_NUMBER + AST_PRES_ALLOWED
	294	#define OPBX_PRES_ALLOWED_NETWORK_NUMBER \
	295	OPBX_PRES_NETWORK_NUMBER + OPBX_PRES_ALLOWED
296	296
297		#define AST_PRES_PROHIB_USER_NUMBER_NOT_SCREENED \
298		AST_PRES_USER_NUMBER_UNSCREENED + AST_PRES_RESTRICTED
	297	#define OPBX_PRES_PROHIB_USER_NUMBER_NOT_SCREENED \
	298	OPBX_PRES_USER_NUMBER_UNSCREENED + OPBX_PRES_RESTRICTED
299	299
300		#define AST_PRES_PROHIB_USER_NUMBER_PASSED_SCREEN \
301		AST_PRES_USER_NUMBER_PASSED_SCREEN + AST_PRES_RESTRICTED
	300	#define OPBX_PRES_PROHIB_USER_NUMBER_PASSED_SCREEN \
	301	OPBX_PRES_USER_NUMBER_PASSED_SCREEN + OPBX_PRES_RESTRICTED
302	302
303		#define AST_PRES_PROHIB_USER_NUMBER_FAILED_SCREEN \
304		AST_PRES_USER_NUMBER_FAILED_SCREEN + AST_PRES_RESTRICTED
	303	#define OPBX_PRES_PROHIB_USER_NUMBER_FAILED_SCREEN \
	304	OPBX_PRES_USER_NUMBER_FAILED_SCREEN + OPBX_PRES_RESTRICTED
305	305
306		#define AST_PRES_PROHIB_NETWORK_NUMBER \
307		AST_PRES_NETWORK_NUMBER + AST_PRES_RESTRICTED
	306	#define OPBX_PRES_PROHIB_NETWORK_NUMBER \
	307	OPBX_PRES_NETWORK_NUMBER + OPBX_PRES_RESTRICTED
308	308
309		#define AST_PRES_NUMBER_NOT_AVAILABLE \
310		AST_PRES_NETWORK_NUMBER + AST_PRES_UNAVAILABLE
	309	#define OPBX_PRES_NUMBER_NOT_AVAILABLE \
	310	OPBX_PRES_NETWORK_NUMBER + OPBX_PRES_UNAVAILABLE
311	311
312		int ast_parse_caller_presentation(const char *data);
313		const char *ast_describe_caller_presentation(int data);
	312	int OPBX_parse_caller_presentation(const char *data);
	313	const char *OPBX_describe_caller_presentation(int data);
314	314
315	315	/*! \page Def_CallerPres Caller ID Presentation
316	316
---	---
320	320	The following values are available to use:
321	321	\arg \b Defined value, text string in config file, explanation
322	322
323		\arg \b AST_PRES_ALLOWED_USER_NUMBER_NOT_SCREENED, "allowed_not_screened", Presentation Allowed, Not Screened,
324		\arg \b AST_PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN, "allowed_passed_screen", Presentation Allowed, Passed Screen,
325		\arg \b AST_PRES_ALLOWED_USER_NUMBER_FAILED_SCREEN, "allowed_failed_screen", Presentation Allowed, Failed Screen,
326		\arg \b AST_PRES_ALLOWED_NETWORK_NUMBER, "allowed", Presentation Allowed, Network Number,
327		\arg \b AST_PRES_PROHIB_USER_NUMBER_NOT_SCREENED, "prohib_not_screened", Presentation Prohibited, Not Screened,
328		\arg \b AST_PRES_PROHIB_USER_NUMBER_PASSED_SCREEN, "prohib_passed_screen", Presentation Prohibited, Passed Screen,
329		\arg \b AST_PRES_PROHIB_USER_NUMBER_FAILED_SCREEN, "prohib_failed_screen", Presentation Prohibited, Failed Screen,
330		\arg \b AST_PRES_PROHIB_NETWORK_NUMBER, "prohib", Presentation Prohibited, Network Number,
	323	\arg \b OPBX_PRES_ALLOWED_USER_NUMBER_NOT_SCREENED, "allowed_not_screened", Presentation Allowed, Not Screened,
	324	\arg \b OPBX_PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN, "allowed_passed_screen", Presentation Allowed, Passed Screen,
	325	\arg \b OPBX_PRES_ALLOWED_USER_NUMBER_FAILED_SCREEN, "allowed_failed_screen", Presentation Allowed, Failed Screen,
	326	\arg \b OPBX_PRES_ALLOWED_NETWORK_NUMBER, "allowed", Presentation Allowed, Network Number,
	327	\arg \b OPBX_PRES_PROHIB_USER_NUMBER_NOT_SCREENED, "prohib_not_screened", Presentation Prohibited, Not Screened,
	328	\arg \b OPBX_PRES_PROHIB_USER_NUMBER_PASSED_SCREEN, "prohib_passed_screen", Presentation Prohibited, Passed Screen,
	329	\arg \b OPBX_PRES_PROHIB_USER_NUMBER_FAILED_SCREEN, "prohib_failed_screen", Presentation Prohibited, Failed Screen,
	330	\arg \b OPBX_PRES_PROHIB_NETWORK_NUMBER, "prohib", Presentation Prohibited, Network Number,
331	331
332	332	\par References
333	333	\arg \ref callerid.h Definitions
---	---
335	335	\arg \ref CID Caller ID names and numbers
336	336	*/
337	337
338
339		#endif /* _ASTERISK_CALLERID_H */
	338	#endif

callweaver/trunk/include/callweaver/channel.h (unified diff)

r2627	r2638
212	212
213	213	/*! Who are we bridged to, if we're bridged. Who is proxying for us,
214	214	if we are proxied (i.e. chan_agent).
215		Do not access directly, use ast_bridged_channel(chan) */
	215	Do not access directly, use opbx_bridged_channel(chan) */
216	216	struct opbx_channel *_bridge;
217	217	/! Channel that will masquerade as us /
218	218	struct opbx_channel *masq;
---	---
551	551	* \param chan channel to be soft-hung-up
552	552	* Call the protocol layer, but don't destroy the channel structure (use this if you are trying to
553	553	* safely hangup a channel managed by another thread.
554		* \param cause Ast hangupcause for hangup
	554	* \param cause opbx hangupcause for hangup
555	555	* Returns 0 regardless
556	556	*/
557	557	int opbx_softhangup(struct opbx_channel *chan, int cause);
558	558	/*! Softly hangup up a channel (no channel lock)
559		* \param cause Ast hangupcause for hangup */
	559	* \param cause opbx hangupcause for hangup */
560	560	int opbx_softhangup_nolock(struct opbx_channel *chan, int cause);
561	561
562	562	/! Check to see if a channel is needing hang up /

callweaver/trunk/include/callweaver/generic_jb.h (unified diff)

r2537	r2638
6	6	* Contributors:
7	7	* Slav Klenov <slav@securax.org>
8	8	*
9		* Copyright on this file is disclaimed to Digium for inclusion in Asterisk
10		*
11		* See http://www.asterisk.org for more information about
12		* the Asterisk project. Please do not directly contact
	9	* See http://www.callweaver.org for more information about
	10	* the CallWeaver project. Please do not directly contact
13	11	* any of the maintainers of this project for assistance;
14	12	* the project provides a web site, mailing lists and IRC
15	13	* channels for your use.
---	---
25	23	*
26	24	*/
27	25
28		#ifndef _ABSTRACT_JB_H_
29		#define _ABSTRACT_JB_H_
	26	#ifndef _CALLWEAVER_GENERIC_JB_H_
	27	#define _CALLWEAVER_GENERIC_JB_H_
30	28
31	29	#include <stdio.h>
32	30	#include <sys/time.h>
---	---
287	285	}
288	286	#endif
289	287
290		#endif /* _ABSTRACT_JB_H_ */
	288	#endif

callweaver/trunk/include/callweaver/icd/app_icd.h (unified diff)

r2611	r2638
30	30	* \brief app_icd.h - Main entry point of Intelligent Call Distribution
31	31	*
32	32	* This module represents the Intelligent Call Distribution system. It
33		* provides the public interface that other systems, particularly Asterisk,
	33	* provides the public interface that other systems, particularly CallWeaver,
34	34	* can use for interacting with the ICD system.
35	35	*
36	36	* The ICD system provides a mechanism for creating queues of callers, each
---	---
38	38	* calls between the two lists using a completely configurable mechanism
39	39	* called a distributor.
40	40	*
41		* The app_icd module will typically be controlled through Asterisk as an
	41	* The app_icd module will typically be controlled through CallWeaver as an
42	42	* application, but that is not required. You can also control it through a
43		* custom Asterisk manager, for example. You could even interact with it from
	43	* custom CallWeaver manager, for example. You could even interact with it from
44	44	* one of the other apps. The functions available for that purpose are
45	45	* identified here.
46	46	*
---	---
58	58	icd_status icd_module_load_dynamic_module(icd_config_registry * registry);
59	59	icd_status icd_module_unload_dynamic_modules(void);
60	60
61		/*** Asterisk-specific APIs ***/
	61	/*** CallWeaver-specific APIs ***/
62	62
63		/* These functions are the mechanism that Asterisk uses to control ICD.
	63	/* These functions are the mechanism that CallWeaver uses to control ICD.
64	64	* They are declared in module.h so there is no need to declare them a
65	65	* second time here. They are provided for documentation purposes only.
66	66	* If you wish to use these functions, include module.h in your file.

callweaver/trunk/include/callweaver/rtp.h (unified diff)

r2615	r2638
178	178	void opbx_rtp_offered_from_local(struct opbx_rtp* rtp, int local);
179	179
180	180	void opbx_rtp_get_current_formats(struct opbx_rtp* rtp,
181		int* astFormats, int* nonAstFormats);
	181	int* opbx_formats, int* non_opbx_formats);
182	182
183	183	/* Mapping an CallWeaver code into a MIME subtype (string): */
184	184	char* opbx_rtp_lookup_mime_subtype(int is_opbx_format, int code);

callweaver/trunk/include/callweaver/udptl.h (unified diff)

r2615	r2638
96	96	void opbx_udptl_set_udptlmap_type(struct opbx_udptl *udptl, int pt,
97	97	char mimeType, char mimeSubtype);
98	98
99		int opbx_udptl_lookup_code(struct opbx_udptl* udptl, int isAstFormat, int code);
	99	int opbx_udptl_lookup_code(struct opbx_udptl* udptl, int is_opbx_format, int code);
100	100
101	101	void opbx_udptl_offered_from_local(struct opbx_udptl *udptl, int local);
102	102
---	---
113	113	void opbx_udptl_set_far_max_datagram(struct opbx_udptl* udptl, int max_datagram);
114	114
115	115	void opbx_udptl_get_current_formats(struct opbx_udptl *udptl,
116		int astFormats, int nonAstFormats);
	116	int opbx_formats, int non_opbx_formats);
117	117
118	118	void opbx_udptl_setnat(struct opbx_udptl *udptl, int nat);
119	119

callweaver/trunk/include/callweaver/utils.h (unified diff)

r2615	r2638
266	266
267	267	On Linux, UDP sockets default to sending packets with the Dont Fragment (DF)
268	268	bit set. This is supposedly done to allow the application to do PMTU
269		discovery, but Asterisk does not do this.
	269	discovery, but CallWeaver does not do this.
270	270
271		Because of this, UDP packets sent by Openpbx that are larger than the MTU
	271	Because of this, UDP packets sent by CallWeaver that are larger than the MTU
272	272	of any hop in the path will be lost. This function can be called on a socket
273	273	to ensure that the DF bit will not be set.
274	274	*/

callweaver/trunk/pbx/ael/ael.tab.c (unified diff)

r2611	r2638
163	163	#line 1 "ael.y"
164	164
165	165	/*
166		* Asterisk -- An open source telephony toolkit.
	166	* CallWeaver -- An open source telephony toolkit.
167	167	*
168	168	* Copyright (C) 2006, Digium, Inc.
169	169	*
170	170	* Steve Murphy <murf@parsetree.com>
171	171	*
172		* See http://www.asterisk.org for more information about
173		* the Asterisk project. Please do not directly contact
	172	* See http://www.callweaver.org for more information about
	173	* the CallWeaver project. Please do not directly contact
174	174	* any of the maintainers of this project for assistance;
175	175	* the project provides a web site, mailing lists and IRC
176	176	* channels for your use.

callweaver/trunk/pbx/ael/ael.y (unified diff)

r2630	r2638
1	1	%{
2	2	/*
3		* Asterisk -- An open source telephony toolkit.
	3	* CallWeaver -- An open source telephony toolkit.
4	4	*
5	5	* Copyright (C) 2006, Digium, Inc.
6	6	*
7	7	* Steve Murphy <murf@parsetree.com>
8	8	*
9		* See http://www.asterisk.org for more information about
10		* the Asterisk project. Please do not directly contact
	9	* See http://www.callweaver.org for more information about
	10	* the CallWeaver project. Please do not directly contact
11	11	* any of the maintainers of this project for assistance;
12	12	* the project provides a web site, mailing lists and IRC
13	13	* channels for your use.

callweaver/trunk/pbx/ael/ael_lex.c (unified diff)

r2611	r2638
797	797	#define YY_RESTORE_YY_MORE_OFFSET
798	798	#line 1 "ael.flex"
799	799	/*
800		* Asterisk -- An open source telephony toolkit.
	800	* CallWeaver -- An open source telephony toolkit.
801	801	*
802	802	* Copyright (C) 2006, Digium, Inc.
803	803	*
804	804	* Steve Murphy <murf@parsetree.com>
805	805	*
806		* See http://www.asterisk.org for more information about
807		* the Asterisk project. Please do not directly contact
	806	* See http://www.callweaver.org for more information about
	807	* the CallWeaver project. Please do not directly contact
808	808	* any of the maintainers of this project for assistance;
809	809	* the project provides a web site, mailing lists and IRC
810	810	* channels for your use.

callweaver/trunk/pbx/pbx_ael.c (unified diff)

r2615	r2638
1	1	/*
2		* Asterisk -- An open source telephony toolkit.
	2	* CallWeaver -- An open source telephony toolkit.
3	3	*
4	4	* Copyright (C) 2006, Digium, Inc.
5	5	*
6	6	* Steve Murphy <murf@parsetree.com>
7	7	*
8		* See http://www.asterisk.org for more information about
9		* the Asterisk project. Please do not directly contact
	8	* See http://www.callweaver.org for more information about
	9	* the CallWeaver project. Please do not directly contact
10	10	* any of the maintainers of this project for assistance;
11	11	* the project provides a web site, mailing lists and IRC
12	12	* channels for your use.
---	---
18	18
19	19	/*! \file
20	20	*
21		* \brief Compile symbolic Asterisk Extension Logic into Asterisk extensions, version 2.
	21	* \brief Compile symbolic Asterisk Extension Logic into CallWeaver extensions, version 2.
22	22	*
23	23	*/
24	24