major header file cleanup: license, copyrights, descriptions, markers, etc.

remove deprecated config_old.c/config_old.h
remove unused cvsid.h


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6454 65c4cc65-6c06-0410-ace0-fbb531ad65f3

LICENSE

@@ -3,7 +3,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 

Makefile

@@ -323,7 +323,7 @@ OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
 	cdr.o tdd.o acl.o rtp.o manager.o asterisk.o \
 	dsp.o chanvars.o indications.o autoservice.o db.o privacy.o \
 	astmm.o enum.o srv.o dns.o aescrypt.o aestab.o aeskey.o \
-	utils.o config_old.o plc.o jitterbuf.o dnsmgr.o devicestate.o \
+	utils.o plc.o jitterbuf.o dnsmgr.o devicestate.o \
 	netsock.o slinfactory.o ast_expr2.o ast_expr2f.o
 
 ifeq (${OSARCH},Darwin)

config.c

@@ -394,7 +394,7 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat,
 				} else if (!strcasecmp(cur, "+")) {
 					*cat = category_get(cfg, catname, 1);
 					if (!*cat) {
-						ast_destroy(cfg);
+						ast_config_destroy(cfg);
 						if (newcat)
 							ast_category_destroy(newcat);
 						ast_log(LOG_WARNING, "Category addition requested, but category '%s' does not exist, line %d of %s\n", catname, lineno, configfile);

config_old.c

@@ -1,72 +0,0 @@
-/*
- * Asterisk -- A telephony toolkit for Linux.
- *
- * Configuration File Parser (Deprecated APIs)
- * 
- * Copyright (C) 2005, Digium, Inc.
- *
- * Mark Spencer <markster@digium.com>
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License
- */
-
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
-#include "asterisk/config.h"
-#include "asterisk/logger.h"
-
-struct ast_config *ast_load(char *configfile)
-{
-	static int warning = 0;
-
-	if (!warning) {
-		ast_log(LOG_WARNING, "ast_load is deprecated, use ast_config_load instead!\n");
-		warning = 1;
-	}
-
-	return ast_config_load(configfile);
-}
-
-void ast_destroy(struct ast_config *config)
-{
-	static int warning = 0;
-
-	if (!warning) {
-		ast_log(LOG_WARNING, "ast_destroy is deprecated, use ast_config_destroy instead!\n");
-		warning = 1;
-	}
-	ast_config_destroy(config);
-}
-
-void ast_destroy_realtime(struct ast_variable *var)
-{
-	static int warning = 0;
-
-	if (!warning) {
-		ast_log(LOG_WARNING, "ast_destroy_realtime is deprecated, use ast_variables_destroy instead!\n");
-		warning = 1;
-	}
-	ast_variables_destroy(var);
-}
-
-struct ast_config *ast_internal_load(const char *configfile, struct ast_config *cfg)
-{
-	static int warning = 0;
-
-	if (!warning) {
-		ast_log(LOG_WARNING, "ast_internal_load is deprecated, use ast_config_internal_load instead!\n");
-		warning = 1;
-	}
-
-	return ast_internal_load(configfile, cfg);
-}
-

include/asterisk/acl.h

@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Access Control of various sorts
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 1999-2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Access Control of various sorts
  */
 
 #ifndef _ASTERISK_ACL_H
@@ -44,4 +53,4 @@ extern int ast_str2tos(const char *value, int *tos);
 }
 #endif
 
-#endif
+#endif /* _ASTERISK_ACL_H */

include/asterisk/adsi.h

@@ -1,21 +1,28 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * ADSI Support (built upon Caller*ID) 
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 1999, Mark Spencer
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License.
+ * the GNU General Public License Version 2. See the LICENSE file
- *
+ * at the top of the source tree.
- * Includes code and algorithms from the Zapata library.
- *
  */
 
-#ifndef _ADSI_H
+/*
-#define _ADSI_H
+ * ADSI Support (built upon Caller*ID) 
+ */
+
+#ifndef _ASTERISK_ADSI_H
+#define _ASTERISK_ADSI_H
+
 #include "asterisk/callerid.h"
 
 /* ADSI Message types */
@@ -342,4 +349,5 @@ extern int adsi_input_control(unsigned char *buf, int page, int line, int displa
  *
  */
 extern int adsi_input_format(unsigned char *buf, int num, int dir, int wrap, unsigned char *format1, unsigned char *format2);
-#endif
+
+#endif /* _ASTERISK_ADSI_H */

include/asterisk/aes.h

@@ -1,3 +1,13 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ */
+
 /*
  ---------------------------------------------------------------------------
  Copyright (c) 2003, Dr Brian Gladman <brg@gladman.me.uk>, Worcester, UK.

include/asterisk/agi.h

@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * AGI Extension interfaces
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 1999, Mark Spencer
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * AGI Extension interfaces
  */
 
 #ifndef _ASTERISK_AGI_H
@@ -44,6 +53,4 @@ void agi_unregister(agi_command *cmd);
 }
 #endif
 
-
+#endif /* _ASTERISK_AGI_H */
-
-#endif

include/asterisk/alaw.h

@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * A-Law to Signed linear conversion
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 1999, Mark Spencer
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * A-Law to Signed linear conversion
  */
 
 #ifndef _ASTERISK_ALAW_H
@@ -31,4 +40,4 @@ extern short __ast_alaw[256];
 #define AST_LIN2A(a) (__ast_lin2a[((unsigned short)(a)) >> 3])
 #define AST_ALAW(a) (__ast_alaw[(int)(a)])
 
-#endif
+#endif /* _ASTERISK_ALAW_H */

include/asterisk/app.h

@@ -1,15 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Application convenience functions, designed to give consistent
- * look and feel to asterisk apps.
- * 
  * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Application convenience functions, designed to give consistent
+ * look and feel to Asterisk apps.
  */
 
 #ifndef _ASTERISK_APP_H
@@ -197,4 +205,4 @@ int ast_record_review(struct ast_channel *chan, const char *playfile, const char
 }
 #endif
 
-#endif
+#endif /* _ASTERISK_APP_H */

include/asterisk/ast_expr.h

@@ -1,12 +1,19 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Copyright (C) 2005, Digium, Inc.
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
  */
 
 #ifndef _ASTERISK_EXPR_H

include/asterisk/astdb.h

@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Persistant data storage (akin to *doze registry)
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 1999, Mark Spencer
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Persistant data storage (akin to *doze registry)
  */
 
 #ifndef _ASTERISK_ASTDB_H
@@ -40,4 +49,4 @@ void ast_db_freetree(struct ast_db_entry *entry);
 }
 #endif
 
-#endif
+#endif /* _ASTERISK_ASTDB_H */

include/asterisk/astmm.h

@@ -1,19 +1,28 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Asterisk debugging
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 2002, Mark Spencer
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Asterisk memory usage debugging
  */
 
 #ifndef NO_AST_MM
-#ifndef _ASTMM_H
+#ifndef _ASTERISK_ASTMM_H
-#define _ASTMM_H
+#define _ASTERISK_ASTMM_H
 
 #define __AST_DEBUG_MALLOC
 
@@ -66,5 +75,5 @@ void __ast_mm_init(void);
 
 #else
 #error "NEVER INCLUDE astmm.h DIRECTLY!!"
-#endif
+#endif /* _ASTERISK_ASTMM_H */
 #endif

include/asterisk/astobj.h

@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Object Model for Asterisk
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 2004 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Object Model for Asterisk
  */
 
 #ifndef _ASTERISK_ASTOBJ_H
@@ -740,4 +749,4 @@ extern "C" {
 }
 #endif
 
-#endif
+#endif /* _ASTERISK_ASTOBJ_H */

include/asterisk/astosp.h

@@ -1,18 +1,28 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * OSP support
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 1999, Mark Spencer
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * OSP support
  */
 
 #ifndef _ASTERISK_OSP_H
 #define _ASTERISK_OSP_H
+
 #include "asterisk/channel.h"
 #include <netinet/in.h>
 #include <time.h>
@@ -35,4 +45,4 @@ int ast_osp_terminate(int handle, int cause, time_t start, time_t duration);
 
 int ast_osp_validate(char *provider, char *token, int *handle, unsigned int *timeout, char *callerid, struct in_addr addr, char *extension);
 
-#endif
+#endif /* _ASTERISK_OSP_H */

include/asterisk/callerid.h

@@ -1,21 +1,28 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * CallerID (and other GR30) Generation support 
- * 
  * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License.
+ * the GNU General Public License Version 2. See the LICENSE file
- *
+ * at the top of the source tree.
- * Includes code and algorithms from the Zapata library.
- *
  */
 
-#ifndef _CALLERID_H
+/*
-#define _CALLERID_H
+ * CallerID (and other GR30) Generation support 
+ * Includes code and algorithms from the Zapata library.
+ */
+
+#ifndef _ASTERISK_CALLERID_H
+#define _ASTERISK_CALLERID_H
 
 #define MAX_CALLERID_SIZE 32000
 
@@ -271,4 +278,4 @@ static inline float callerid_getcarrier(float *cr, float *ci, int bit)
 int ast_parse_caller_presentation(const char *data);
 const char *ast_describe_caller_presentation(int data);
 
-#endif
+#endif /* _ASTERISK_CALLERID_H */

include/asterisk/causes.h

@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Internal Asterisk's hangup causes
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- *
- * Copyright (C) 2003, Digium
  *
  * Martin Pycko <martinp@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Internal Asterisk hangup causes
  */
 
 #ifndef _ASTERISK_CAUSES_H
@@ -70,4 +79,4 @@
 #define AST_CAUSE_NOTDEFINED 				0
 #define AST_CAUSE_NOSUCHDRIVER				AST_CAUSE_CHAN_NOT_IMPLEMENTED
 
-#endif
+#endif /* _ASTERISK_CAUSES_H */

include/asterisk/cdr.h

@@ -1,17 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Call Detail Record API 
- * 
  * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License.
+ * the GNU General Public License Version 2. See the LICENSE file
- *
+ * at the top of the source tree.
- * Includes code and algorithms from the Zapata library.
+ */
- *
+
+/*
+ * Call Detail Record API 
  */
 
 #ifndef _ASTERISK_CDR_H

include/asterisk/channel.h

@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * General Asterisk channel definitions.
- * 
  * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * General Asterisk channel definitions.
  */
 
 #ifndef _ASTERISK_CHANNEL_H
@@ -1083,4 +1092,4 @@ extern char *ast_print_group(char *buf, int buflen, ast_group_t group);
 }
 #endif
 
-#endif
+#endif /* _ASTERISK_CHANNEL_H */

include/asterisk/chanvars.h

@@ -1,18 +1,27 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Channel Variables
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 2002, Mark Spencer
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
  */
 
-#ifndef _ASTERISK_CHANVARS_INCLUDE
+/*
-#define _ASTERISK_CHANVARS_INCLUDE
+ * Channel Variables
+ */
+
+#ifndef _ASTERISK_CHANVARS_H
+#define _ASTERISK_CHANVARS_H
 
 #include "asterisk/linkedlists.h"
 
@@ -28,4 +37,4 @@ char *ast_var_name(struct ast_var_t *var);
 char *ast_var_full_name(struct ast_var_t *var);
 char *ast_var_value(struct ast_var_t *var);
 
-#endif
+#endif /* _ASTERISK_CHANVARS_H */

include/asterisk/cli.h

@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Standard Command Line Interface
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 1999, Mark Spencer
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Standard Command Line Interface
  */
 
 #ifndef _ASTERISK_CLI_H
@@ -100,4 +109,4 @@ extern char **ast_cli_completion_matches(char *, char *);
 }
 #endif
 
-#endif
+#endif /* _ASTERISK_CLI_H */

include/asterisk/compiler.h

@@ -1,12 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Compiler-specific macros and other items
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
- * Copyright (C) 2005, Digium, Inc.
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Compiler-specific macros and other items
  */
 
 #ifndef _ASTERISK_COMPILER_H

include/asterisk/config.h

@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Configuration File Parser
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 1999-2005, Mark Spencer
  *
  * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Configuration File Parser
  */
 
 #ifndef _ASTERISK_CONFIG_H
@@ -36,8 +45,6 @@ struct ast_variable {
 	char stuff[0];
 };
 
-#include "asterisk/config_old.h"
-
 typedef struct ast_config *config_load_func(const char *database, const char *table, const char *configfile, struct ast_config *config);
 typedef struct ast_variable *realtime_var_get(const char *database, const char *table, va_list ap);
 typedef struct ast_config *realtime_multi_get(const char *database, const char *table, va_list ap);
@@ -197,4 +204,4 @@ struct ast_config *ast_config_internal_load(const char *configfile, struct ast_c
 }
 #endif
 
-#endif
+#endif /* _ASTERISK_CONFIG_H */

include/asterisk/config_old.h

@@ -1,42 +0,0 @@
-/*
- * Asterisk -- A telephony toolkit for Linux.
- *
- * Configuration File Parser (Deprecated APIs)
- * 
- * Copyright (C) 1999-2005, Mark Spencer
- *
- * Mark Spencer <markster@digium.com>
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License
- */
-
-#ifndef _ASTERISK_CONFIG_OLD_H
-#define _ASTERISK_CONFIG_OLD_H
-
-/*! Load a config file */
-/*! 
- * \param configfile path of file to open.  If no preceding '/' character, path is considered relative to AST_CONFIG_DIR
- * Create a config structure from a given configuration file.
- * Returns NULL on error, or an ast_config data structure on success
- */
-struct ast_config *ast_load(char *configfile);
-
-/*! Removes a config */
-/*!
- * \param config config data structure associated with the config.
- * Free memory associated with a given config
- * Returns nothing
- */
-void ast_destroy(struct ast_config *config);
-
-/*! Free variable list */
-/*!
- * \param var the linked list of variables to free
- * This function frees a list of variables.
- */
-void ast_destroy_realtime(struct ast_variable *var);
-
-struct ast_config *ast_internal_load(const char *configfile, struct ast_config *cfg);
-
-#endif

include/asterisk/crypto.h

@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Provide cryptographic signature routines
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 1999, Mark Spencer
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Provide cryptographic signature routines
  */
 
 #ifndef _ASTERISK_CRYPTO_H
@@ -112,4 +121,4 @@ extern int ast_decrypt_bin(unsigned char *dst, const unsigned char *src, int src
 }
 #endif
 
-#endif
+#endif /* _ASTERISK_CRYPTO_H */

include/asterisk/cvsid.h

@@ -1,61 +0,0 @@
-/*
- * Asterisk -- A telephony toolkit for Linux.
- *
- * CVSID Macro for including CVS file Id in source files.
- * 
- * Copyright (C) 2004 - 2005, William Waites
- *
- * William Waites <ww@styx.org>
- *
- * This program is free software, distributed under the following
- * terms:
- *
- *        1. Any copies of this file must retain this copyright
- *           notice intact.
- *        2. A non-exclusive, non-cancellible license is given
- *           to Digium Inc. (Linux Support Services) in order that
- *           they may license this file to third parties under terms
- *           of their choosing on the condition that if they do so
- *           they must also make this file, or any derivative of
- *           it, available under terms of the the GNU General Public
- *           License.
- *        3. If you have not recieved this file under a proprietary
- *           license from Digium or one of their licensees, or the
- *           author, it is distributed to you under terms of the GNU
- *           General Public License.
- * 
- * If you do not have a copy of the GNU GPL, which should be
- * available in the root directory of this source tree, it can
- * be found at:
- *
- *        http://www.gnu.org/licenses/gpl.html
- *           
- */
-
-/*
- * To use this macro, in the source file put the lines:
- *
- * #include "asterisk/cvsid.h"
- * #ifndef lint
- * CVSID("$Id$");
- * #endif
- *
- * You will then be able to run strings(1) on the resulting
- * binary and find out what revisions of each source file were
- * used to build it, since when checked into a CVS repository,
- * the portion of the string between the dollar signs will be
- * replaced with version information for the file.
- */
-
-#ifndef ASTERISK_CVSID_H
-#define ASTERISK_CVSID_H
-
-#ifdef __GNUC__
-#define CVSID(x) static char __cvsid[] __attribute__ ((unused)) = x
-#else
-#define CVSID(x) static char __cvsid[] = x
-#endif
-
-#endif /* ASTERISK_CVSID_H */
-
-

include/asterisk/devicestate.h

@@ -1,12 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Device state management
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
+ *
- * Copyright (C) 2005, Digium, Inc.
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Device state management
  */
 
 #ifndef _ASTERISK_DEVICESTATE_H

include/asterisk/dlfcn-compat.h

@@ -1,3 +1,13 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ */
+
 /*
 Copyright (c) 2002 Jorge Acereda  <jacereda@users.sourceforge.net> &
                    Peter O'Gorman <ogorman@users.sourceforge.net>
@@ -28,6 +38,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+
 #ifndef _DLFCN_H_
 #define _DLFCN_H_
 

include/asterisk/dns.h

@@ -1,12 +1,23 @@
 /*
- * DNS support
+ * Asterisk -- An open source telephony toolkit.
- * 
+ *
  * Written by Thorsten Lockert <tholo@trollphone.org>
  *
  * Funding provided by Troll Phone Networks AS
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * DNS support
  */
 
 #ifndef _ASTERISK_DNS_H

include/asterisk/dnsmgr.h

@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Background DNS update manager
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 2005, Kevin P. Fleming
  *
  * Kevin P. Fleming <kpfleming@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Background DNS update manager
  */
 
 #ifndef _ASTERISK_DNSMGR_H

include/asterisk/dsp.h

@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Convenient Signal Processing routines
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 1999, Mark Spencer
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Convenient Signal Processing routines
  */
 
 #ifndef _ASTERISK_DSP_H
@@ -97,4 +106,5 @@ int ast_dsp_get_tstate(struct ast_dsp *dsp);
 
 /* Get tcount (Threshold counter) */
 int ast_dsp_get_tcount(struct ast_dsp *dsp);
-#endif
+
+#endif /* _ASTERISK_DSP_H */

include/asterisk/dundi.h

@@ -1,13 +1,25 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
 /*
  * Distributed Universal Number Discovery (DUNDi)
- *
- * Copyright (C) 2004 - 2005, Digium Inc.
- *
- * Written by Mark Spencer <markster@digium.com>
- *
- * This program is Free Software distributed under the terms of
- * of the GNU General Public License.
  */
+
 #ifndef _ASTERISK_DUNDI_H 
 #define _ASTERISK_DUNDI_H
 
@@ -209,4 +221,5 @@ int dundi_query_eid(struct dundi_entity_info *dei, const char *dcontext, dundi_e
 
 /* Pre-cache to push upstream peers */
 int dundi_precache(const char *dcontext, const char *number);
+
 #endif /* _ASTERISK_DUNDI_H */

include/asterisk/endian.h

@@ -1,16 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Asterisk architecture endianess compatibility definitions
- * 
  * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU Lesser General Public License.  Other components of
+ * the GNU General Public License Version 2. See the LICENSE file
- * Asterisk are distributed under The GNU General Public License
+ * at the top of the source tree.
- * only.
+ */
+
+/*
+ * Asterisk architecture endianess compatibility definitions
  */
 
 #ifndef _ASTERISK_ENDIAN_H

include/asterisk/enum.h

@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * ENUM support
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 1999-2005, Digium, inc
  *
  * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * ENUM support
  */
 
 /*!	\file enum.h
@@ -17,7 +26,9 @@
 
 #ifndef _ASTERISK_ENUM_H
 #define _ASTERISK_ENUM_H
+
 #include "asterisk/channel.h"
+
 /*! \brief Lookup entry in ENUM Returns 1 if found, 0 if not found, -1 on hangup 
 	\param chan	Channel
 	\param number	Number in E164 format without the + (for e164.arpa) or format 
@@ -43,4 +54,5 @@ extern int ast_get_txt(struct ast_channel *chan, const char *number, char *locat
 
 extern int ast_enum_init(void);
 extern int ast_enum_reload(void);
-#endif
+
+#endif /* _ASTERISK_ENUM_H */

include/asterisk/features.h

@@ -1,17 +1,24 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Call Parking and Pickup API 
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 1999, Mark Spencer
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License.
+ * the GNU General Public License Version 2. See the LICENSE file
- *
+ * at the top of the source tree.
+ */
+
+/*
+ * Call Parking and Pickup API 
  * Includes code and algorithms from the Zapata library.
- *
  */
 
 #ifndef _AST_FEATURES_H
@@ -82,5 +89,4 @@ extern void ast_register_feature(struct ast_call_feature *feature);
     \param feature the ast_call_feature object which was registered before*/
 extern void ast_unregister_feature(struct ast_call_feature *feature);
 
-     
 #endif /* _AST_FEATURES_H */

include/asterisk/file.h

@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Generic File Format Support.
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 1999, Mark Spencer
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Generic File Format Support.
  */
 
 #ifndef _ASTERISK_FILE_H
@@ -318,6 +327,4 @@ extern int ast_file_init(void);
 }
 #endif
 
-
+#endif /* _ASTERISK_FILE_H */
-
-#endif

include/asterisk/frame.h

@@ -1,16 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Asterisk internal frame definitions.
- * 
  * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU Lesser General Public License.  Other components of
+ * the GNU General Public License Version 2. See the LICENSE file
- * Asterisk are distributed under The GNU General Public License
+ * at the top of the source tree.
- * only.
+ */
+
+/*
+ * Asterisk internal frame definitions.
  */
 
 #ifndef _ASTERISK_FRAME_H
@@ -413,5 +420,4 @@ static inline int ast_codec_interp_len(int format)
 }
 #endif
 
-
+#endif /* _ASTERISK_FRAME_H */
-#endif

include/asterisk/fskmodem.h

@@ -1,21 +1,28 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * FSK Modem Support 
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 1999, Mark Spencer
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License.
+ * the GNU General Public License Version 2. See the LICENSE file
- *
+ * at the top of the source tree.
- * Includes code and algorithms from the Zapata library.
- *
  */
 
-#ifndef _FSKMODEM_H
+/*
-#define _FSKMODEM_H
+ * FSK Modem Support 
+ * Includes code and algorithms from the Zapata library.
+ */
+
+#ifndef _ASTERISK_FSKMODEM_H
+#define _ASTERISK_FSKMODEM_H
 
 #define PARITY_NONE		0
 #define PARITY_EVEN		1
@@ -60,4 +67,4 @@ typedef struct {
    He must be called with at least 80 bytes of buffer. */
 extern int fsk_serie(fsk_data *fskd, short *buffer, int *len, int *outbyte);
 
-#endif
+#endif /* _ASTERISK_FSKMODEM_H */

include/asterisk/image.h

@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * General Asterisk channel definitions.
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 1999, Mark Spencer
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * General Asterisk channel definitions.
  */
 
 #ifndef _ASTERISK_IMAGE_H
@@ -84,4 +93,4 @@ extern void ast_image_unregister(struct ast_imager *imgdrv);
  */
 extern int ast_image_init(void);
 
-#endif
+#endif /* _ASTERISK_IMAGE_H */

include/asterisk/indications.h

@@ -1,3 +1,13 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ */
+
 /*
  * BSD Telephony Of Mexico "Tormenta" Tone Zone Support 2/22/01
  * 
@@ -74,4 +84,4 @@ void ast_playtones_stop(struct ast_channel *chan);
 extern struct tone_zone *tone_zones;
 extern ast_mutex_t tzlock;
 
-#endif
+#endif /* _ASTERISK_INDICATIONS_H */

include/asterisk/inline_api.h

@@ -1,12 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Inlinable API function macro
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
- * Copyright (C) 2005, Digium, Inc.
+ * Kevin P. Fleming <kpfleming@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Inlinable API function macro
  */
 
 #ifndef __ASTERISK_INLINEAPI_H

include/asterisk/io.h

@@ -1,18 +1,27 @@
 /*
- * Asterisk
+ * Asterisk -- An open source telephony toolkit.
- * 
- * Mark Spencer <markster@marko.net>
  *
- * Copyright(C) Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Distributed under the terms of the GNU General Public License (GPL) Version 2
  *
- * I/O Managment (derived from Cheops-NG)
+ * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
  */
 
-#ifndef _IO_H
+/*
-#define _IO_H
+ * I/O Management (derived from Cheops-NG)
+ */
+
+#ifndef _ASTERISK_IO_H
+#define _ASTERISK_IO_H
 
 #ifdef __APPLE__
 #include "asterisk/poll-compat.h"
@@ -133,5 +142,4 @@ extern int ast_get_termcols(int fd);
 }
 #endif
 
-
+#endif /* _ASTERISK_IO_H */
-#endif

include/asterisk/linkedlists.h

@@ -1,3 +1,22 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
+ * Kevin P. Fleming <kpfleming@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
 #ifndef ASTERISK_LINKEDLISTS_H
 #define ASTERISK_LINKEDLISTS_H
 
@@ -337,4 +356,4 @@ struct {								\
 	}								\
 } while (0)
 
-#endif
+#endif /* _ASTERISK_LINKEDLISTS_H */

include/asterisk/localtime.h

@@ -1,14 +1,24 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Custom localtime functions for multiple timezones
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 2003, Mark Spencer
  *
+ * Mark Spencer <markster@digium.com>
  * Tilghman Lesher <tlesher@vcch.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Custom localtime functions for multiple timezones
  */
 
 #ifndef _ASTERISK_LOCALTIME_H
@@ -21,4 +31,4 @@ extern time_t ast_mktime(struct tm * const tmp, const char *zone);
 extern char *ast_ctime(const time_t * const timep);
 extern char *ast_ctime_r(const time_t * const timep, char *buf);
 
-#endif
+#endif /* _ASTERISK_LOCALTIME_H */

include/asterisk/lock.h

@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * General Asterisk channel definitions.
- * 
  * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * General Asterisk channel definitions.
  */
 
 #ifndef _ASTERISK_LOCK_H
@@ -394,4 +403,4 @@ static inline int ast_mutex_trylock(ast_mutex_t *pmutex)
 #define pthread_create __use_ast_pthread_create_instead__
 #endif
 
-#endif
+#endif /* _ASTERISK_LOCK_H */

include/asterisk/logger.h

@@ -1,27 +1,34 @@
 /*
- * Asterisk
+ * Asterisk -- An open source telephony toolkit.
- * 
+ *
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
  * Mark Spencer <markster@digium.com>
  *
- * Copyright(C) 1999-2005, Digium, Inc.
+ * See http://www.asterisk.org for more information about
- * 
+ * the Asterisk project. Please do not directly contact
- * Distributed under the terms of the GNU General Public License (GPL) Version 2
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
- * Logging routines
+ * This program is free software, distributed under the terms of
- *
+ * the GNU General Public License Version 2. See the LICENSE file
- * $Revision$
+ * at the top of the source tree.
  */
+
 /*!
   \file logger.h
   \brief Support for logging to various files, console and syslog
 	Configuration in file logger.conf
 */
 
-#ifndef _LOGGER_H
+#ifndef _ASTERISK_LOGGER_H
-#define _LOGGER_H
+#define _ASTERISK_LOGGER_H
+
 #ifdef SOLARIS
 #include <solaris-compat/compat.h>
 #endif
+
 #include <stdarg.h>
 
 #if defined(__cplusplus) || defined(c_plusplus)
@@ -117,5 +124,4 @@ extern void ast_console_puts(const char *string);
 }
 #endif
 
-
+#endif /* _ASTERISK_LOGGER_H */
-#endif

include/asterisk/manager.h

@@ -1,17 +1,24 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * AMI - Asterisk Management Interface
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * External call management support 
- * 
- * Copyright (C) 1999-2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
- * This program is free software, distributed under the terms of
+ * See http://www.asterisk.org for more information about
- * the GNU General Public License.
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
- * $Revision$
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * AMI - Asterisk Management Interface
+ * External call management support 
  */
 
 #ifndef _ASTERISK_MANAGER_H
@@ -156,4 +163,5 @@ extern void astman_send_ack(struct mansession *s, struct message *m, char *msg);
 extern int init_manager(void);
 /*! Called by Asterisk initialization */
 extern int reload_manager(void);
-#endif
+
+#endif /* _ASTERISK_MANAGER_H */

include/asterisk/md5.h

@@ -1,5 +1,23 @@
-#ifndef MD5_H
+/*
-#define MD5_H
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+#ifndef _ASTERISK_MD5_H
+#define _ASTERISK_MD5_H
 
 #include <inttypes.h>
 
@@ -15,4 +33,4 @@ void MD5Update(struct MD5Context *context, unsigned char const *buf,
 void MD5Final(unsigned char digest[16], struct MD5Context *context);
 void MD5Transform(uint32_t buf[4], uint32_t const in[16]);
 
-#endif /* !MD5_H */
+#endif /* _ASTERISK_MD5_H */

include/asterisk/module.h

@@ -1,14 +1,19 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Module definitions
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 1999, Mark Spencer
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
  */
 
 /*! \file
@@ -394,9 +399,8 @@ void ast_unregister_atexit(void (*func)(void));
 	res = localusecnt; \
 }
 	
-	
-
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif
-#endif
+
+#endif /* _ASTERISK_MODULE_H */

include/asterisk/monitor.h

@@ -1,5 +1,27 @@
-#ifndef _MONITOR_H
+/*
-#define _MONITOR_H
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Channel monitoring
+ */
+
+#ifndef _ASTERISK_MONITOR_H
+#define _ASTERISK_MONITOR_H
 
 #include <stdio.h>
 
@@ -34,4 +56,4 @@ int ast_monitor_change_fname(	struct ast_channel *chan,
 
 void ast_monitor_setjoinfiles(struct ast_channel *chan, int turnon);
 
-#endif /* _MONITOR_H */
+#endif /* _ASTERISK_MONITOR_H */

include/asterisk/musiconhold.h

@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Options provided by main asterisk program
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 1999, Mark Spencer
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Music on hold handling
  */
 
 #ifndef _ASTERISK_MOH_H
@@ -35,6 +44,4 @@ void ast_moh_cleanup(struct ast_channel *chan);
 }
 #endif
 
-
+#endif /* _ASTERISK_MOH_H */
-
-#endif

include/asterisk/netsock.h

@@ -1,15 +1,24 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Network socket handling
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 2004-2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  * Kevin P. Fleming <kpfleming@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Network socket handling
  */
 
 #ifndef _ASTERISK_NETSOCK_H
@@ -54,4 +63,4 @@ void *ast_netsock_data(const struct ast_netsock *ns);
 }
 #endif
 
-#endif
+#endif /* _ASTERISK_NETSOCK_H */

include/asterisk/options.h

@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Options provided by main asterisk program
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 1999, Mark Spencer
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Options provided by main asterisk program
  */
 
 #ifndef _ASTERISK_OPTIONS_H
@@ -52,6 +61,4 @@ extern char debug_filename[AST_FILENAME_MAX];
 }
 #endif
 
-
+#endif /* _ASTERISK_OPTIONS_H */
-
-#endif

include/asterisk/pbx.h

@@ -1,15 +1,25 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Core PBX routines and definitions.
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 1999, Mark Spencer
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
  */
+
+/*
+ * Core PBX routines and definitions.
+ */
+
 #ifndef _ASTERISK_PBX_H
 #define _ASTERISK_PBX_H
 
@@ -642,5 +652,4 @@ void ast_hint_state_changed(const char *device);
 }
 #endif
 
-
+#endif /* _ASTERISK_PBX_H */
-#endif

include/asterisk/poll-compat.h

@@ -1,3 +1,13 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ */
+
 /*---------------------------------------------------------------------------*\
   $Id$
 

include/asterisk/privacy.h

@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Persistant data storage (akin to *doze registry)
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 1999, Mark Spencer
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Persistant data storage (akin to *doze registry)
  */
 
 #ifndef _ASTERISK_PRIVACY_H
@@ -34,4 +43,4 @@ int ast_privacy_reset(char *dest);
 }
 #endif
 
-#endif
+#endif /* _ASTERISK_PRIVACY_H */

include/asterisk/res_odbc.h

@@ -1,24 +1,34 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ * Copyright (C) 2004 - 2005, Anthony Minessale II
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
+ * Anthony Minessale <anthmct@yahoo.com>
  *
- * res_odbc.h <ODBC resource manager>
+ * See http://www.asterisk.org for more information about
- * Copyright (C) 2004 - 2005 Anthony Minessale II <anthmct@yahoo.com>
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
  */
 
-#ifndef _RES_ODBC_H
+/*
-#define _RES_ODBC_H
+ * ODBC resource manager
+ */
+
+#ifndef _ASTERISK_RES_ODBC_H
+#define _ASTERISK_RES_ODBC_H
 
 #include <sql.h>
 #include <sqlext.h>
 #include <sqltypes.h>
 
-
-
-
 typedef struct odbc_obj odbc_obj;
 
 typedef enum { ODBC_SUCCESS=0,ODBC_FAIL=-1} odbc_status;
@@ -36,9 +46,6 @@ struct odbc_obj {
 
 };
 
-
-
-
 /* functions */
 odbc_obj *new_odbc_obj(char *name,char *dsn,char *username, char *password);
 odbc_status odbc_obj_connect(odbc_obj *obj);
@@ -50,4 +57,5 @@ int odbc_dump_fd(int fd,odbc_obj *obj);
 int odbc_sanity_check(odbc_obj *obj);
 int odbc_smart_execute(odbc_obj *obj, SQLHSTMT stmt);
 int odbc_smart_direct_execute(odbc_obj *obj, SQLHSTMT stmt, char *sql);
-#endif
+
+#endif /* _ASTERISK_RES_ODBC_H */

include/asterisk/rtp.h

@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Real-time Transport Protocol support
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 1999-2005, Digium
  *
  * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Real-time Transport Protocol support
  */
 
 #ifndef _ASTERISK_RTP_H
@@ -125,4 +134,4 @@ void ast_rtp_reload(void);
 }
 #endif
 
-#endif
+#endif /* _ASTERISK_RTP_H */

include/asterisk/say.h

@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Say numbers and dates (maybe words one day too)
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 1999, Mark Spencer
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Say numbers and dates (maybe words one day too)
  */
 
 #ifndef _ASTERISK_SAY_H
@@ -90,4 +99,4 @@ int ast_say_date_with_format(struct ast_channel *chan, time_t t, const char *int
 }
 #endif
 
-#endif
+#endif /* _ASTERISK_SAY_H */

include/asterisk/sched.h

@@ -1,14 +1,23 @@
 /*
- * Asterisk
+ * Asterisk -- An open source telephony toolkit.
- * 
- * Mark Spencer <markster@marko.net>
  *
- * Copyright(C) Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Distributed under the terms of the GNU General Public License (GPL) Version 2
  *
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
  * Scheduler Routines (derived from cheops)
- *
  */
 
 #ifndef _ASTERISK_SCHED_H
@@ -148,6 +157,4 @@ extern long ast_sched_when(struct sched_context *con,int id);
 }
 #endif
 
-
+#endif /* _ASTERISK_SCHED_H */
-
-#endif

include/asterisk/slinfactory.h

@@ -1,15 +1,24 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * A machine to gather up arbitrary frames and convert them
+ * Copyright (C) 2005, Anthony Minessale II
- * to raw slinear on demand.
- * 
- * Copyright (C) 2005, Anthony Minessale II.
  *
  * Anthony Minessale <anthmct@yahoo.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * A machine to gather up arbitrary frames and convert them
+ * to raw slinear on demand.
  */
 
 #ifndef _ASTERISK_SLINFACTORY_H
@@ -44,4 +53,4 @@ int ast_slinfactory_read(struct ast_slinfactory *sf, short *buf, size_t bytes);
 }
 #endif
 
-#endif
+#endif /* _ASTERISK_SLINFACTORY_H */

include/asterisk/srv.h

@@ -1,16 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * DNS SRV record support
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 1999-2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
- * 
+ * at the top of the source tree.
- * $Revision$
+ */
+
+/*
+ * DNS SRV record support
  */
 
 #ifndef _ASTERISK_SRV_H
@@ -37,4 +44,4 @@ struct ast_channel;
 */
 extern int ast_get_srv(struct ast_channel *chan, char *host, int hostlen, int *port, const char *service);
 
-#endif
+#endif /* _ASTERISK_SRV_H */

include/asterisk/strings.h

@@ -1,12 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * String manipulation functions
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
- * Copyright (C) 2005, Digium, Inc.
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * String manipulation functions
  */
 
 #ifndef _ASTERISK_STRINGS_H

include/asterisk/tdd.h

@@ -1,21 +1,28 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * TTY/TDD Generation support 
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 1999, Mark Spencer
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License.
+ * the GNU General Public License Version 2. See the LICENSE file
- *
+ * at the top of the source tree.
- * Includes code and algorithms from the Zapata library.
- *
  */
 
-#ifndef _TDD_H
+/*
-#define _TDD_H
+ * TTY/TDD Generation support 
+ * Includes code and algorithms from the Zapata library.
+ */
+
+#ifndef _ASTERISK_TDD_H
+#define _ASTERISK_TDD_H
 
 #define	TDD_BYTES_PER_CHAR	2700
 
@@ -71,4 +78,4 @@ extern void tdd_free(struct tdd_state *tdd);
  */
 extern int ast_tdd_gen_ecdisa(unsigned char *outbuf, int len);
 
-#endif
+#endif /* _ASTERISK_TDD_H */

include/asterisk/term.h

@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Handy terminal functions for vt* terms
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 1999, Mark Spencer
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Handy terminal functions for vt* terms
  */
 
 #ifndef _ASTERISK_TERM_H
@@ -62,4 +71,4 @@ extern char *term_quit(void);
 }
 #endif
 
-#endif
+#endif /* _ASTERISK_TERM_H */

include/asterisk/time.h

@@ -1,12 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Time-related functions and macros
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
- * Copyright (C) 2004 - 2005, Digium, Inc.
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Time-related functions and macros
  */
 
 #ifndef _ASTERISK_TIME_H

include/asterisk/transcap.h

@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * General Asterisk channel definitions.
- * 
  * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Matthew Fredrickson <creslin@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * General Asterisk channel definitions.
  */
 
 #ifndef _ASTERISK_TRANSCAP_H

include/asterisk/translate.h

@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Translate via the use of pseudo channels
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 1999, Mark Spencer
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Translate via the use of pseudo channels
  */
 
 #ifndef _ASTERISK_TRANSLATE_H
@@ -108,4 +117,4 @@ extern struct ast_frame *ast_translate(struct ast_trans_pvt *tr, struct ast_fram
 }
 #endif
 
-#endif
+#endif /* _ASTERISK_TRANSLATE_H */

include/asterisk/ulaw.h

@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * u-Law to Signed linear conversion
+ * Copyright (C) 1999 - 2005, Digium, Inc.
- * 
- * Copyright (C) 1999, Mark Spencer
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * u-Law to Signed linear conversion
  */
 
 #ifndef _ASTERISK_ULAW_H
@@ -31,4 +40,4 @@ extern short __ast_mulaw[256];
 #define AST_LIN2MU(a) (__ast_lin2mu[((unsigned short)(a)) >> 2])
 #define AST_MULAW(a) (__ast_mulaw[(a)])
 
-#endif
+#endif /* _ASTERISK_ULAW_H */

include/asterisk/unaligned.h

@@ -1,16 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Handle unaligned data access
- * 
  * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU Lesser General Public License.  Other components of
+ * the GNU General Public License Version 2. See the LICENSE file
- * Asterisk are distributed under The GNU General Public License
+ * at the top of the source tree.
- * only.
+ */
+
+/*
+ * Handle unaligned data access
  */
 
 #ifndef _ASTERISK_UNALIGNED_H

include/asterisk/utils.h

@@ -1,12 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Utility functions
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
- * Copyright (C) 2004 - 2005, Digium, Inc.
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Utility functions
  */
 
 #ifndef _ASTERISK_UTILS_H

include/asterisk/vmodem.h

@@ -1,14 +1,23 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Voice Modem Definitions
- * 
  * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * Voice Modem Definitions
  */
 
 #ifndef _ASTERISK_VMODEM_H
@@ -171,4 +180,5 @@ extern struct ast_channel *ast_modem_new(struct ast_modem_pvt *i, int state);
 /*! Trim string of trailing stuff */
 /*! Trim off trailing mess */
 extern void ast_modem_trim(char *s);
-#endif
+
+#endif /* _ASTERISK_VMODEM_H */