Merged revisions 71063 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r71063 | murf | 2007-06-22 08:10:24 -0600 (Fri, 22 Jun 2007) | 1 line

My conditions for merging amaflags info was naive; DOCUMENTATION is the default, although null is possible; theft of user-settable fields is not good. Just copy them, leave them alone.
This is for bug 10016. (plus a small fix to rtp, to elim a compiler warning (dev mode))
........

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

diff --git a/main/cdr.c b/main/cdr.c
index 11dbc56..2c95141 100644 (file)
--- a/main/cdr.c
+++ b/main/cdr.c
@@ -579,17 +579,18 @@ void ast_cdr_merge(struct ast_cdr *to, struct ast_cdr *from)
                ast_copy_string(to->dst, from->dst, sizeof(to->dst));
                from->dst[0] = 0; /* theft */
        }
-       if (ast_test_flag(from, AST_CDR_FLAG_LOCKED) || (!to->amaflags && from->amaflags)) {
+       if (!to->amaflags)
+               to->amaflags = AST_CDR_DOCUMENTATION;
+       if (!from->amaflags)
+               from->amaflags = AST_CDR_DOCUMENTATION; /* make sure both amaflags are set to something (DOC is default) */
+       if (ast_test_flag(from, AST_CDR_FLAG_LOCKED) || (to->amaflags == AST_CDR_DOCUMENTATION && from->amaflags != AST_CDR_DOCUMENTATION)) {
                to->amaflags = from->amaflags;
-               from->amaflags = 0; /* theft */
        }
        if (ast_test_flag(from, AST_CDR_FLAG_LOCKED) || (ast_strlen_zero(to->accountcode) && !ast_strlen_zero(from->accountcode))) {
                ast_copy_string(to->accountcode, from->accountcode, sizeof(to->accountcode));
-               from->accountcode[0] = 0; /* theft */
        }
        if (ast_test_flag(from, AST_CDR_FLAG_LOCKED) || (ast_strlen_zero(to->userfield) && !ast_strlen_zero(from->userfield))) {
                ast_copy_string(to->userfield, from->userfield, sizeof(to->userfield));
-               from->userfield[0] = 0; /* theft */
        }
        /* flags, varsead, ? */
        cdr_merge_vars(from, to);

diff --git a/main/rtp.c b/main/rtp.c
index de2308e..bd117fd 100644 (file)
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -1050,7 +1050,7 @@ struct ast_frame *ast_rtcp_read(struct ast_rtp *rtp)
                                                                    "IAJitter: %u\r\n"
                                                                    "LastSR: %lu.%010lu\r\n"
                                                                    "DLSR: %4.4f(sec)\r\n"
-                                                                   "RTT: %lu(sec)\r\n",
+                                                                   "RTT: %llu(sec)\r\n",
                                                                    ast_inet_ntoa(sin.sin_addr), ntohs(sin.sin_port),
                                                                    pt, (pt == 200) ? "Sender Report" : (pt == 201) ? "Receiver Report" : (pt == 192) ? "H.261 FUR" : "Unknown",
                                                                    rc,