aboutsummaryrefslogtreecommitdiffstats
path: root/include/asterisk
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2003-05-02 15:37:34 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2003-05-02 15:37:34 +0000
commit69841867537dfa3d428ff5006c5f4a76a4a781ab (patch)
tree3b65f539dfb3e4461436cdc4d8a48891221a677c /include/asterisk
parentf90d5056f66da9d01d4223b369c4bcba0bf83681 (diff)
Show uptime
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@951 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk')
-rwxr-xr-xinclude/asterisk/options.h2
-rwxr-xr-xinclude/asterisk/rtp.h4
2 files changed, 5 insertions, 1 deletions
diff --git a/include/asterisk/options.h b/include/asterisk/options.h
index 56b23908c..f9314bb1f 100755
--- a/include/asterisk/options.h
+++ b/include/asterisk/options.h
@@ -27,6 +27,8 @@ extern int option_initcrypto;
extern int option_nocolor;
extern int fully_booted;
extern char defaultlanguage[];
+extern time_t ast_startuptime;
+extern time_t ast_lastreloadtime;
#define VERBOSE_PREFIX_1 " "
#define VERBOSE_PREFIX_2 " == "
diff --git a/include/asterisk/rtp.h b/include/asterisk/rtp.h
index 6ae6b0a2c..e0b83bb0f 100755
--- a/include/asterisk/rtp.h
+++ b/include/asterisk/rtp.h
@@ -30,8 +30,10 @@ extern "C" {
#define AST_RTP_DTMF (1 << 0)
/*! 'Comfort Noise' (RFC3389) */
#define AST_RTP_CN (1 << 1)
+/*! DTMF (Cisco Proprietary) */
+#define AST_RTP_CISCO_DTMF (1 << 2)
/*! Maximum RTP-specific code */
-#define AST_RTP_MAX AST_RTP_CN
+#define AST_RTP_MAX AST_RTP_CISCO_DTMF
struct ast_rtp_protocol {
struct ast_rtp *(*get_rtp_info)(struct ast_channel *chan); /* Get RTP struct, or NULL if unwilling to transfer */