1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
$NetBSD: patch-main_manager.c,v 1.3 2021/01/02 22:45:43 jnemeth Exp $
--- main/manager.c.orig 2018-07-12 16:19:01.000000000 +0000
+++ main/manager.c
@@ -2640,7 +2640,7 @@ static char *handle_showmanconn(struct a
struct mansession_session *session;
time_t now = time(NULL);
#define HSMCONN_FORMAT1 " %-15.15s %-55.55s %-10.10s %-10.10s %-8.8s %-8.8s %-5.5s %-5.5s\n"
-#define HSMCONN_FORMAT2 " %-15.15s %-55.55s %-10d %-10d %-8d %-8d %-5.5d %-5.5d\n"
+#define HSMCONN_FORMAT2 " %-15.15s %-55.55s %-10jd %-10jd %-8d %-8d %-5.5d %-5.5d\n"
int count = 0;
struct ao2_iterator i;
@@ -2666,8 +2666,8 @@ static char *handle_showmanconn(struct a
ao2_lock(session);
ast_cli(a->fd, HSMCONN_FORMAT2, session->username,
ast_sockaddr_stringify_addr(&session->addr),
- (int) (session->sessionstart),
- (int) (now - session->sessionstart),
+ (intmax_t) (session->sessionstart),
+ (intmax_t) (now - session->sessionstart),
session->fd,
session->inuse,
session->readperm,
@@ -3507,9 +3507,9 @@ static int action_ping(struct mansession
astman_append(
s,
"Ping: Pong\r\n"
- "Timestamp: %ld.%06lu\r\n"
+ "Timestamp: %jd.%06lu\r\n"
"\r\n",
- (long) now.tv_sec, (unsigned long) now.tv_usec);
+ (intmax_t) now.tv_sec, (unsigned long) now.tv_usec);
return 0;
}
@@ -4645,7 +4645,7 @@ static int action_status(struct mansessi
"DNID: %s\r\n"
"EffectiveConnectedLineNum: %s\r\n"
"EffectiveConnectedLineName: %s\r\n"
- "TimeToHangup: %ld\r\n"
+ "TimeToHangup: %jd\r\n"
"BridgeID: %s\r\n"
"Application: %s\r\n"
"Data: %s\r\n"
@@ -4679,7 +4679,7 @@ static int action_status(struct mansessi
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>"),
- (long)ast_channel_whentohangup(chan)->tv_sec,
+ (intmax_t)ast_channel_whentohangup(chan)->tv_sec,
bridge ? bridge->uniqueid : "",
ast_channel_appl(chan),
ast_channel_data(chan),
@@ -6921,8 +6921,8 @@ static int __attribute__((format(printf,
if (timestampevents) {
now = ast_tvnow();
ast_str_append(&buf, 0,
- "Timestamp: %ld.%06lu\r\n",
- (long)now.tv_sec, (unsigned long) now.tv_usec);
+ "Timestamp: %jd.%06lu\r\n",
+ (intmax_t)now.tv_sec, (unsigned long) now.tv_usec);
}
if (manager_debug) {
static int seq;
|
