X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=route.h;h=3530ef45a7ab948b86182b48dc9b7d815f26ee0b;hp=7b5fded726baa81ee359ec34954171638592c6fc;hb=3ac6881c22bce18091f19b06958ac66016bf9a32;hpb=701b046a45c2c79cc6d07ac3a4f84f499f7ed376

diff --git a/route.h b/route.h
index 7b5fded..3530ef4 100644
--- a/route.h
+++ b/route.h
@@ -41,6 +41,7 @@ enum { /* what to check during runtime */
 	MATCH_PORT,
 	MATCH_INTERFACE,
 	MATCH_CALLERID,
+	MATCH_CALLERID2,
 	MATCH_EXTENSION,
 	MATCH_DIALING,
 	MATCH_ENBLOCK,
@@ -88,6 +89,12 @@ enum { /* how to parse text file during startup */
 	PARAM_TYPE_PORTS,
 	PARAM_TYPE_TYPE,
 	PARAM_TYPE_CALLERIDTYPE,
+	PARAM_TYPE_ON,
+};
+
+enum { /* defines when a statement should be executed */
+	INFO_ON_INIT,
+	INFO_ON_HANGUP,
 };
 
 /* parameter ID bits */
@@ -131,11 +138,15 @@ enum { /* how to parse text file during startup */
 #define PARAM_CALLERIDTYPE	(1LL<<37)
 #define PARAM_CALLTO		(1LL<<38)
 #define PARAM_ROOM		(1LL<<39)
-#define PARAM_TIMEOUT		(1LL<<40)
-#define PARAM_NOPASSWORD	(1LL<<41)
-#define PARAM_STRIP		(1LL<<42)
-#define PARAM_APPLICATION	(1LL<<43)
-
+#define PARAM_JINGLE		(1LL<<40)
+#define PARAM_TIMEOUT		(1LL<<41)
+#define PARAM_NOPASSWORD	(1LL<<42)
+#define PARAM_STRIP		(1LL<<43)
+#define PARAM_APPLICATION	(1LL<<44)
+#define PARAM_CONTEXT		(1LL<<45)
+#define PARAM_EXTEN		(1LL<<46)
+#define PARAM_ON		(1LL<<47)
+#define PARAM_KEYPAD		(1LL<<48)
 
 /* action index
  * NOTE: The given index is the actual entry number of action_defs[], so add/remove both lists!!!
@@ -163,16 +174,15 @@ enum { /* how to parse text file during startup */
 #define	ACTION_GOTO		20
 #define	ACTION_MENU		21
 #define	ACTION_DISCONNECT	22
-#define	ACTION_HELP		23
-#define ACTION_DEFLECT		24
-#define ACTION_SETFORWARD	25
-#define ACTION_EXECUTE		26
-#define ACTION_FILE		27
-#define ACTION_PICK		28
-#define	ACTION_PASSWORD		29
-#define	ACTION_PASSWORD_WRITE	30
-#define	ACTION_NOTHING		31
-#define	ACTION_EFI		32
+#define ACTION_DEFLECT		23
+#define ACTION_SETFORWARD	24
+#define ACTION_EXECUTE		25
+#define ACTION_FILE		26
+#define ACTION_PICK		27
+#define	ACTION_PASSWORD		28
+#define	ACTION_PASSWORD_WRITE	29
+#define	ACTION_NOTHING		30
+#define	ACTION_EFI		31
 
 struct route_cond { /* an item */
 	struct route_cond	*next;			/* next entry */
@@ -211,40 +221,41 @@ struct route_rule { /* a rule has a list of items and actions */
 	int			line;			/* line parsed from */
 	struct route_cond	*cond_first;		/* link to condition list */
 	struct route_action	*action_first;		/* link to action list */
+//	int			temp_couldmatch;	/* stores, if the dialing could match. this is used to make a list of rules, that could match */
 };
 
 struct route_ruleset { /* the ruleset is a list of rules */
 	struct route_ruleset	*next;			/* next item */
 	char			file[128];		/* filename */
 	int			line;			/* line parsed from */
-	char			name[64];		/* name of rule */
+	char			name[64];		/* name of ruleset */
 	struct route_rule	*rule_first;		/* linke to rule list */
 };
 
 struct cond_defs { /* defintion of all conditions */
-	char			*name;			/* item's name */
+	const char		*name;			/* item's name */
 	int			match;			/* what to check */
 	int			type;			/* type of value (COND_TYPE) */
-	char			*doc;			/* syntax */
-	char			*help;			/* short help */
+	const char		*doc;			/* syntax */
+	const char		*help;			/* short help */
 };
 
 struct param_defs { /* definition of all options */
 	unsigned long long	id;			/* ID of parameter (just for checking) */
-	char			*name;			/* name of parameter */
+	const char		*name;			/* name of parameter */
 	int			type;			/* type of value (PARAM_TYPE_*) */
-	char			*doc;			/* syntax */
-	char			*help;			/* quick help */
+	const char		*doc;			/* syntax */
+	const char		*help;			/* quick help */
 };
 
 struct action_defs { /* definition of all actions */
 	int			id;			/* ID of parameter (just for checking) */
-	char			*name;
+	const char		*name;
 	void			(EndpointAppPBX::*init_func)(void);
 	void			(EndpointAppPBX::*dialing_func)(void);
 	void			(EndpointAppPBX::*hangup_func)(void);
 	unsigned long long	 params;
-	char			*help;
+	const char		*help;
 };
 
 
@@ -270,5 +281,5 @@ void ruleset_free(struct route_ruleset *ruleset_start);
 void ruleset_debug(struct route_ruleset *ruleset_start);
 extern char ruleset_error[256];
 struct route_ruleset *ruleset_parse(void);
-struct route_ruleset *getrulesetbyname(char *name);
+struct route_ruleset *getrulesetbyname(const char *name);