Fix compilations errors on 64-bit OpenBSD systems

In versiong 5.5, OpenBSD went to 64-bit time values. This requires a cast to
(long) when printing members of certain time structs.

Review: https://reviewboard.asterisk.org/r/4507

ASTERISK-24879 #close
Reported by: snuffy
Tested by: snuffy
patches:
  openbsd-time64.diff uploaded by snuffy (License 5024)
........

Merged revisions 433268 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 433269 from http://svn.asterisk.org/svn/asterisk/branches/13

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

diff --git a/apps/app_queue.c b/apps/app_queue.c
index d41641c625bc2162b770edff5e16dc2b1de37942..0f3d9f713e5b64811f286e10dc77ceb08cdb94cd 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -5284,7 +5284,7 @@ static int wait_our_turn(struct queue_ent *qe, int ringing, enum queue_result *r
 
                        if ((status = get_member_status(qe->parent, qe->max_penalty, qe->min_penalty, qe->parent->leavewhenempty, 0))) {
                                *reason = QUEUE_LEAVEEMPTY;
-                               ast_queue_log(qe->parent->name, ast_channel_uniqueid(qe->chan), "NONE", "EXITEMPTY", "%d|%d|%ld", qe->pos, qe->opos, (long) time(NULL) - qe->start);
+                               ast_queue_log(qe->parent->name, ast_channel_uniqueid(qe->chan), "NONE", "EXITEMPTY", "%d|%d|%ld", qe->pos, qe->opos, (long) (time(NULL) - qe->start));
                                leave_queue(qe);
                                break;
                        }
@@ -5702,8 +5702,8 @@ static void log_attended_transfer(struct queue_stasis_data *queue_data, struct a
 
        ast_queue_log(queue_data->queue->name, caller->uniqueid, queue_data->member->membername, "ATTENDEDTRANSFER", "%s|%ld|%ld|%d",
                        ast_str_buffer(transfer_str),
-                       (long) queue_data->starttime - queue_data->holdstart,
-                       (long) time(NULL) - queue_data->starttime, queue_data->caller_pos);
+                       (long) (queue_data->starttime - queue_data->holdstart),
+                       (long) (time(NULL) - queue_data->starttime), queue_data->caller_pos);
 }
 
 /*!
@@ -5789,8 +5789,8 @@ static void handle_blind_transfer(void *userdata, struct stasis_subscription *su
        ast_queue_log(queue_data->queue->name, caller_snapshot->uniqueid, queue_data->member->membername,
                        "BLINDTRANSFER", "%s|%s|%ld|%ld|%d",
                        exten, context,
-                       (long) queue_data->starttime - queue_data->holdstart,
-                       (long) time(NULL) - queue_data->starttime, queue_data->caller_pos);
+                       (long) (queue_data->starttime - queue_data->holdstart),
+                       (long) (time(NULL) - queue_data->starttime), queue_data->caller_pos);
 
        send_agent_complete(queue_data->queue->name, caller_snapshot, member_snapshot, queue_data->member,
                        queue_data->holdstart, queue_data->starttime, TRANSFER);
@@ -6657,7 +6657,7 @@ static int try_calling(struct queue_ent *qe, struct ast_flags opts, char **opt_a
                        } else if (ast_check_hangup(qe->chan)) {
                                /* Caller must have hung up just before being connected */
                                ast_log(LOG_NOTICE, "Caller was about to talk to agent on %s but the caller hungup.\n", ast_channel_name(peer));
-                               ast_queue_log(queuename, ast_channel_uniqueid(qe->chan), member->membername, "ABANDON", "%d|%d|%ld", qe->pos, qe->opos, (long) time(NULL) - qe->start);
+                               ast_queue_log(queuename, ast_channel_uniqueid(qe->chan), member->membername, "ABANDON", "%d|%d|%ld", qe->pos, qe->opos, (long) (time(NULL) - qe->start));
                                record_abandoned(qe);
                                ast_channel_publish_dial(qe->chan, peer, member->interface, ast_hangup_cause_to_dial_status(ast_channel_hangupcause(peer)));
                                ast_autoservice_chan_hangup_peer(qe->chan, peer);
@@ -6705,7 +6705,7 @@ static int try_calling(struct queue_ent *qe, struct ast_flags opts, char **opt_a
                /* use  pbx_builtin_setvar to set a load of variables with one call */
                if (qe->parent->setqueueentryvar) {
                        snprintf(interfacevar, sizeof(interfacevar), "QEHOLDTIME=%ld,QEORIGINALPOS=%d",
-                               (long) time(NULL) - qe->start, qe->opos);
+                               (long) (time(NULL) - qe->start), qe->opos);
                        pbx_builtin_setvar_multiple(qe->chan, interfacevar);
                        pbx_builtin_setvar_multiple(peer, interfacevar);
                }
@@ -6831,14 +6831,14 @@ static int try_calling(struct queue_ent *qe, struct ast_flags opts, char **opt_a
                        }
                }
                qe->handled++;
-               ast_queue_log(queuename, ast_channel_uniqueid(qe->chan), member->membername, "CONNECT", "%ld|%s|%ld", (long) time(NULL) - qe->start, ast_channel_uniqueid(peer),
+               ast_queue_log(queuename, ast_channel_uniqueid(qe->chan), member->membername, "CONNECT", "%ld|%s|%ld", (long) (time(NULL) - qe->start), ast_channel_uniqueid(peer),
                                                                                                        (long)(orig - to > 0 ? (orig - to) / 1000 : 0));
 
                blob = ast_json_pack("{s: s, s: s, s: s, s: i, s: i}",
                                     "Queue", queuename,
                                     "Interface", member->interface,
                                     "MemberName", member->membername,
-                                    "HoldTime", (long) time(NULL) - qe->start,
+                                    "HoldTime", (long) (time(NULL) - qe->start),
                                     "RingTime", (long)(orig - to > 0 ? (orig - to) / 1000 : 0));
                queue_publish_multi_channel_blob(qe->chan, peer, queue_agent_connect_type(), blob);
 
@@ -7898,7 +7898,7 @@ check_turns:
                        reason = QUEUE_TIMEOUT;
                        res = 0;
                        ast_queue_log(args.queuename, ast_channel_uniqueid(chan),"NONE", "EXITWITHTIMEOUT", "%d|%d|%ld",
-                               qe.pos, qe.opos, (long) time(NULL) - qe.start);
+                               qe.pos, qe.opos, (long) (time(NULL) - qe.start));
                        break;
                }
 
@@ -7964,7 +7964,7 @@ check_turns:
                        record_abandoned(&qe);
                        reason = QUEUE_TIMEOUT;
                        res = 0;
-                       ast_queue_log(qe.parent->name, ast_channel_uniqueid(qe.chan),"NONE", "EXITWITHTIMEOUT", "%d|%d|%ld", qe.pos, qe.opos, (long) time(NULL) - qe.start);
+                       ast_queue_log(qe.parent->name, ast_channel_uniqueid(qe.chan),"NONE", "EXITWITHTIMEOUT", "%d|%d|%ld", qe.pos, qe.opos, (long) (time(NULL) - qe.start));
                        break;
                }
 
@@ -7993,7 +7993,7 @@ stop:
                                record_abandoned(&qe);
                                ast_queue_log(args.queuename, ast_channel_uniqueid(chan), "NONE", "ABANDON",
                                        "%d|%d|%ld", qe.pos, qe.opos,
-                                       (long) time(NULL) - qe.start);
+                                       (long) (time(NULL) - qe.start));
                                res = -1;
                        } else if (qcontinue) {
                                reason = QUEUE_CONTINUE;
@@ -8001,7 +8001,7 @@ stop:
                        }
                } else if (qe.valid_digits) {
                        ast_queue_log(args.queuename, ast_channel_uniqueid(chan), "NONE", "EXITWITHKEY",
-                               "%s|%d|%d|%ld", qe.digits, qe.pos, qe.opos, (long) time(NULL) - qe.start);
+                               "%s|%d|%d|%ld", qe.digits, qe.pos, qe.opos, (long) (time(NULL) - qe.start));
                }
        }
 

diff --git a/funcs/func_cdr.c b/funcs/func_cdr.c
index 2d120bb902746cde1d8c1789cb33c086389497fb..ca54b1e429c199409800374ab1e4fe204a175dfd 100644 (file)
--- a/funcs/func_cdr.c
+++ b/funcs/func_cdr.c
@@ -284,14 +284,16 @@ static void cdr_read_callback(void *data, struct stasis_subscription *sub, struc
                        struct timeval fmt_time;
                        struct ast_tm tm;
                        /* tv_usec is suseconds_t, which could be int or long */
+                       long int tv_sec;
                        long int tv_usec;
 
-                       if (sscanf(tempbuf, "%ld.%ld", &fmt_time.tv_sec, &tv_usec) != 2) {
+                       if (sscanf(tempbuf, "%ld.%ld", &tv_sec, &tv_usec) != 2) {
                                ast_log(AST_LOG_WARNING, "Unable to parse %s (%s) from the CDR for channel %s\n",
                                        args.variable, tempbuf, ast_channel_name(payload->chan));
                                return;
                        }
-                       if (fmt_time.tv_sec) {
+                       if (tv_sec) {
+                               fmt_time.tv_sec = tv_sec;
                                fmt_time.tv_usec = tv_usec;
                                ast_localtime(&fmt_time, &tm, NULL);
                                ast_strftime(tempbuf, sizeof(tempbuf), "%Y-%m-%d %T", &tm);

diff --git a/main/cdr.c b/main/cdr.c
index ef057f4a358861d0533ad17983b71dd25e8a7a75..5e24dae1b2a4a3cfe2ca71beaf61558897b12a89 100644 (file)
--- a/main/cdr.c
+++ b/main/cdr.c
@@ -1257,11 +1257,11 @@ static void cdr_object_finalize(struct cdr_object *cdr)
        /* tv_usec is suseconds_t, which could be int or long */
        ast_debug(1, "Finalized CDR for %s - start %ld.%06ld answer %ld.%06ld end %ld.%06ld dispo %s\n",
                        cdr->party_a.snapshot->name,
-                       cdr->start.tv_sec,
+                       (long)cdr->start.tv_sec,
                        (long)cdr->start.tv_usec,
-                       cdr->answer.tv_sec,
+                       (long)cdr->answer.tv_sec,
                        (long)cdr->answer.tv_usec,
-                       cdr->end.tv_sec,
+                       (long)cdr->end.tv_sec,
                        (long)cdr->end.tv_usec,
                        ast_cdr_disp2str(cdr->disposition));
 }
@@ -1296,7 +1296,7 @@ static void cdr_object_check_party_a_answer(struct cdr_object *cdr) {
                cdr->answer = ast_tvnow();
                /* tv_usec is suseconds_t, which could be int or long */
                CDR_DEBUG(mod_cfg, "%p - Set answered time to %ld.%06ld\n", cdr,
-                       cdr->answer.tv_sec,
+                       (long)cdr->answer.tv_sec,
                        (long)cdr->answer.tv_usec);
        }
 }

diff --git a/main/cli.c b/main/cli.c
index 1d9d82ce8c692332a9f72f6a0af1e910537aa7ff..1edb1f49feba7eacdbefb3437c215bfecb8667fc 100644 (file)
--- a/main/cli.c
+++ b/main/cli.c
@@ -1644,7 +1644,7 @@ static char *handle_showchan(struct ast_cli_entry *e, int cmd, struct ast_cli_ar
                ast_str_buffer(write_transpath),
                ast_str_strlen(read_transpath) ? "Yes" : "No",
                ast_str_buffer(read_transpath),
-               ast_channel_whentohangup(chan)->tv_sec,
+               (long)ast_channel_whentohangup(chan)->tv_sec,
                cdrtime,
                bridge ? bridge->uniqueid : "(Not bridged)",
                ast_channel_context(chan),

diff --git a/main/manager.c b/main/manager.c
index 2bd9c007cd8bab082936021231c3fd39f001b50a..6b1eda0ea8f7acdb78892bea4338713fa3d6deb5 100644 (file)
--- a/main/manager.c
+++ b/main/manager.c
@@ -4423,7 +4423,7 @@ static void generate_status(struct mansession *s, struct ast_channel *chan, char
                S_OR(ast_channel_dialed(chan)->number.str, ""),
                S_COR(effective_id.number.valid, effective_id.number.str, "<unknown>"),
                S_COR(effective_id.name.valid, effective_id.name.str, "<unknown>"),
-               ast_channel_whentohangup(chan)->tv_sec,
+               (long)ast_channel_whentohangup(chan)->tv_sec,
                bridge ? bridge->uniqueid : "",
                ast_channel_linkedid(chan),
                ast_channel_appl(chan),

diff --git a/main/rtp_engine.c b/main/rtp_engine.c
index 7326adf65f4899a762c01af4541cd68548dadfca..8c3367b6f8a033a00472701d740ace704d004fd9 100644 (file)
--- a/main/rtp_engine.c
+++ b/main/rtp_engine.c
@@ -1947,7 +1947,7 @@ static struct ast_json *rtcp_report_to_json(struct stasis_message *msg,
        if (payload->report->type == AST_RTP_RTCP_SR) {
                char sec[32];
                char usec[32];
-               snprintf(sec, sizeof(sec), "%lu", payload->report->sender_information.ntp_timestamp.tv_sec);
+               snprintf(sec, sizeof(sec), "%lu", (unsigned long)payload->report->sender_information.ntp_timestamp.tv_sec);
                snprintf(usec, sizeof(usec), "%lu", (unsigned long)payload->report->sender_information.ntp_timestamp.tv_usec);
                json_rtcp_sender_info = ast_json_pack("{s: s, s: s, s: i, s: i, s: i}",
                                "ntp_timestamp_sec", sec,