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
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
|
--- h/zephyr/zephyr.h.orig Fri Jan 22 23:18:59 1999
+++ h/zephyr/zephyr.h Thu Dec 21 20:25:44 2000
@@ -64,8 +64,8 @@
/* Unique ID format */
typedef struct _ZUnique_Id_t {
- struct in_addr zuid_addr;
- struct timeval tv;
+ struct in_addr zuid_addr;
+ ZEPHYR_INT32 zuid_sec, zuid_usec;
} ZUnique_Id_t;
/* Checksum */
--- lib/ZParseNot.c.orig Thu Aug 12 20:19:44 1999
+++ lib/ZParseNot.c Sun Mar 11 23:18:38 2001
@@ -151,10 +151,10 @@
if (numfields) {
if (ZReadAscii(ptr, end-ptr, (unsigned char *)¬ice->z_uid,
- sizeof(ZUnique_Id_t)) == ZERR_BADFIELD)
+ sizeof(notice->z_uid)) == ZERR_BADFIELD)
BAD_PACKET;
- notice->z_time.tv_sec = ntohl((u_long) notice->z_uid.tv.tv_sec);
- notice->z_time.tv_usec = ntohl((u_long) notice->z_uid.tv.tv_usec);
+ notice->z_time.tv_sec = ntohl((u_long) notice->z_uid.zuid_sec);
+ notice->z_time.tv_usec = ntohl((u_long) notice->z_uid.zuid_usec);
numfields--;
next_field (ptr);
}
@@ -265,10 +265,10 @@
if (numfields) {
if (ZReadAscii(ptr, end-ptr, (unsigned char *)¬ice->z_multiuid,
- sizeof(ZUnique_Id_t)) == ZERR_BADFIELD)
+ sizeof(notice->z_multiuid)) == ZERR_BADFIELD)
BAD_PACKET;
- notice->z_time.tv_sec = ntohl((u_long) notice->z_multiuid.tv.tv_sec);
- notice->z_time.tv_usec = ntohl((u_long) notice->z_multiuid.tv.tv_usec);
+ notice->z_time.tv_sec = ntohl((u_long) notice->z_multiuid.zuid_sec);
+ notice->z_time.tv_usec = ntohl((u_long) notice->z_multiuid.zuid_usec);
numfields--;
next_field (ptr);
}
--- lib/Zinternal.c.orig Sun Mar 11 23:20:05 2001
+++ lib/Zinternal.c Sun Mar 11 23:46:57 2001
@@ -585,6 +585,7 @@
Code_t retval;
static char version[BUFSIZ]; /* default init should be all \0 */
struct sockaddr_in name;
+ struct timeval tv;
int namelen = sizeof(name);
if (!notice->z_sender)
@@ -604,9 +605,9 @@
notice->z_multinotice = "";
- (void) gettimeofday(¬ice->z_uid.tv, (struct timezone *)0);
- notice->z_uid.tv.tv_sec = htonl((u_long) notice->z_uid.tv.tv_sec);
- notice->z_uid.tv.tv_usec = htonl((u_long) notice->z_uid.tv.tv_usec);
+ (void) gettimeofday(&tv, (struct timezone *)0);
+ notice->z_uid.zuid_sec = htonl((u_long) tv.tv_sec);
+ notice->z_uid.zuid_usec = htonl((u_long) tv.tv_usec);
(void) memcpy(¬ice->z_uid.zuid_addr, &__My_addr, sizeof(__My_addr));
@@ -684,7 +685,7 @@
ptr += strlen(ptr)+1;
if (ZMakeAscii(ptr, end-ptr, (unsigned char *)¬ice->z_uid,
- sizeof(ZUnique_Id_t)) == ZERR_FIELDLEN)
+ sizeof(notice->z_uid)) == ZERR_FIELDLEN)
return (ZERR_HEADERLEN);
ptr += strlen(ptr)+1;
@@ -738,7 +739,7 @@
return (ZERR_HEADERLEN);
if (ZMakeAscii(ptr, end-ptr, (unsigned char *)¬ice->z_multiuid,
- sizeof(ZUnique_Id_t)) == ZERR_FIELDLEN)
+ sizeof(notice->z_multiuid)) == ZERR_FIELDLEN)
return (ZERR_HEADERLEN);
ptr += strlen(ptr)+1;
@@ -858,6 +859,7 @@
char multi[64];
int offset, hdrsize, fragsize, ret_len, message_len, waitforack;
Code_t retval;
+ struct timeval tv;
hdrsize = len-notice->z_message_len;
fragsize = Z_MAXPKTLEN-hdrsize-Z_FRAGFUDGE;
@@ -873,12 +875,9 @@
(void) sprintf(multi, "%d/%d", offset, notice->z_message_len);
partnotice.z_multinotice = multi;
if (offset > 0) {
- (void) gettimeofday(&partnotice.z_uid.tv,
- (struct timezone *)0);
- partnotice.z_uid.tv.tv_sec =
- htonl((u_long) partnotice.z_uid.tv.tv_sec);
- partnotice.z_uid.tv.tv_usec =
- htonl((u_long) partnotice.z_uid.tv.tv_usec);
+ (void) gettimeofday(&tv, (struct timezone *)0);
+ partnotice.z_uid.zuid_sec = htonl((u_long) tv.tv_sec);
+ partnotice.z_uid.zuid_usec = htonl((u_long) tv.tv_usec);
(void) memcpy((char *)&partnotice.z_uid.zuid_addr, &__My_addr,
sizeof(__My_addr));
}
--- server/dispatch.c.orig Sun Mar 11 23:27:40 2001
+++ server/dispatch.c Sun Mar 11 23:34:42 2001
@@ -25,8 +25,8 @@
#define NACKTAB_HASHVAL(sockaddr, uid) (((sockaddr).sin_addr.s_addr ^ \
(sockaddr).sin_port ^ \
(uid).zuid_addr.s_addr ^ \
- (uid).tv.tv_sec ^ \
- (uid).tv.tv_usec) % NACKTAB_HASHSIZE)
+ (uid).zuid_sec ^ \
+ (uid).zuid_usec) % NACKTAB_HASHSIZE)
#define HOSTS_SIZE_INIT 256
#ifdef DEBUG
@@ -820,9 +820,10 @@
/* search the not-yet-acked table for this packet, and flush it. */
#if 0
- zdbug((LOG_DEBUG, "nack_cancel: %s:%08X,%08X",
+ zdbug((LOG_DEBUG, "nack_cancel: %s:%08lX,%08lX",
inet_ntoa(notice->z_uid.zuid_addr),
- notice->z_uid.tv.tv_sec, notice->z_uid.tv.tv_usec));
+ (u_long) notice->z_uid.zuid_sec,
+ (u_long) notice->z_uid.zuid_usec));
#endif
hashval = NACKTAB_HASHVAL(*who, notice->z_uid);
for (nacked = nacktab[hashval]; nacked; nacked = nacked->next) {
@@ -840,9 +841,10 @@
}
#if 1
- zdbug((LOG_DEBUG,"nack_cancel: nack not found %s:%08X,%08X",
+ zdbug((LOG_DEBUG,"nack_cancel: nack not found %s:%08lX,%08lX",
inet_ntoa (notice->z_uid.zuid_addr),
- notice->z_uid.tv.tv_sec, notice->z_uid.tv.tv_usec));
+ (u_long) notice->z_uid.zuid_sec,
+ (u_long) notice->z_uid.zuid_usec));
#endif
}
--- server/realm.c.orig Sun Mar 11 23:35:16 2001
+++ server/realm.c Sun Mar 11 23:40:06 2001
@@ -240,9 +240,10 @@
ZPacket_t retval;
#if 0
- zdbug((LOG_DEBUG, "rlm_nack_cancel: %s:%08X,%08X",
+ zdbug((LOG_DEBUG, "rlm_nack_cancel: %s:%08lX,%08lX",
inet_ntoa(notice->z_uid.zuid_addr),
- notice->z_uid.tv.tv_sec, notice->z_uid.tv.tv_usec));
+ (u_long) notice->z_uid.zuid_sec,
+ (u_long) notice->z_uid.zuid_usec));
#endif
if (!which) {
syslog(LOG_ERR, "non-realm ack?");
@@ -266,9 +267,10 @@
}
}
#if 0
- zdbug((LOG_DEBUG,"nack_cancel: nack not found %s:%08X,%08X",
+ zdbug((LOG_DEBUG,"nack_cancel: nack not found %s:%08lX,%08lX",
inet_ntoa (notice->z_uid.zuid_addr),
- notice->z_uid.tv.tv_sec, notice->z_uid.tv.tv_usec));
+ (u_long) notice->z_uid.zuid_sec,
+ (u_long) notice->z_uid.zuid_usec));
#endif
return;
}
@@ -743,6 +745,7 @@
int buffer_len, hdrlen, offset, fragsize, ret_len, message_len;
int origoffset, origlen;
Code_t retval;
+ struct timeval tv;
Unacked *nacked;
char buf[1024], multi[64];
CREDENTIALS cred;
@@ -857,11 +860,9 @@
(void) sprintf(multi, "%d/%d", offset+origoffset, origlen);
partnotice.z_multinotice = multi;
if (offset > 0) {
- (void) gettimeofday(&partnotice.z_uid.tv, (struct timezone *)0);
- partnotice.z_uid.tv.tv_sec = htonl((u_long)
- partnotice.z_uid.tv.tv_sec);
- partnotice.z_uid.tv.tv_usec = htonl((u_long)
- partnotice.z_uid.tv.tv_usec);
+ (void) gettimeofday(&tv, (struct timezone *)0);
+ partnotice.z_uid.zuid_sec = htonl((u_long) tv.tv_sec);
+ partnotice.z_uid.zuid_usec = htonl((u_long) tv.tv_usec);
(void) memcpy((char *)&partnotice.z_uid.zuid_addr, &__My_addr,
sizeof(__My_addr));
}
--- server/server.c.orig Sun Mar 11 23:40:14 2001
+++ server/server.c Sun Mar 11 23:40:44 2001
@@ -22,7 +22,7 @@
#define SRV_NACKTAB_HASHSIZE 1023
#define SRV_NACKTAB_HASHVAL(which, uid) (((which) ^ (uid).zuid_addr.s_addr ^ \
- (uid).tv.tv_sec ^ (uid).tv.tv_usec) \
+ (uid).zuid_sec ^ (uid).zuid_usec) \
% SRV_NACKTAB_HASHSIZE)
/*
* Server manager. Deal with traffic to and from other servers.
|
