[hipl-commit] [trunk] Rev 3608: Replace ushort/uint/ulong (in i3) with their standard counterparts.
- From: Mircea Gherzan <mircea.gherzan@xxxxxxxxxxxxxx>
- To: hipl-commit@xxxxxxxxxxxxx
- Date: Thu, 11 Feb 2010 14:14:15 +0200
Committer: Mircea Gherzan <mircea.gherzan@xxxxxxxxxxxxxx>
Date: Thu Feb 11 13:12:02 2010 +0100
Revision: 3608
Revision-id: mircea.gherzan@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk
Log:
Replace ushort/uint/ulong (in i3) with their standard counterparts.
Modified:
M i3/chord/api.c
M i3/chord/chord.h
M i3/chord/chord_getfingers.c
M i3/chord/chord_traceroute.c
M i3/chord/gen_conf.c
M i3/chord/pack.c
M i3/chord/process.c
M i3/chord/sendpkt.c
M i3/chord/util.c
M i3/i3/i3_addr.c
M i3/i3/i3_id.c
M i3/i3/i3_stack.c
M i3/i3/i3_trigger.c
M i3/i3_client/http.c
M i3/i3_client/i3_client_api_ctx.c
M i3/utils/inetfns.c
=== modified file 'i3/chord/api.c'
--- i3/chord/api.c 2010-02-11 11:49:47 +0000
+++ i3/chord/api.c 2010-02-11 12:12:02 +0000
@@ -62,7 +62,7 @@
#else
{
void *shared_data_ret = shmat(shmid, (void *) 0, 0);
- if ((ulong) shared_data_ret == (ulong) - 1) {
+ if ((unsigned long) shared_data_ret == (unsigned long) - 1) {
eprintf("shmate failed:");
}
shared_data = (chordID *) __trusted_cast(__mkptr_size(shared_data_ret,
=== modified file 'i3/chord/chord.h'
--- i3/chord/chord.h 2010-02-11 11:49:47 +0000
+++ i3/chord/chord.h 2010-02-11 12:12:02 +0000
@@ -198,33 +198,33 @@
};
#pragma ccuredvararg("pack", sizeof(struct pack_args))
struct unpack_args {
- ushort * f1;
+ unsigned short * f1;
uchar * f2;
- ulong * f3;
+ unsigned long * f3;
chordID *id;
};
#pragma ccuredvararg("unpack", sizeof(struct unpack_args))
#endif
extern int pack_data(uchar *buf, uchar type, byte ttl,
- chordID *id, ushort len, uchar *data);
+ chordID *id, unsigned short len, uchar *data);
extern int unpack_data(Server *srv, int n, uchar *buf);
-extern int pack_fs(uchar *buf, byte ttl, chordID *id, ulong addr, ushort port);
+extern int pack_fs(uchar *buf, byte ttl, chordID *id, unsigned long addr,
unsigned short port);
extern int unpack_fs(Server *srv, int n, uchar *buf);
-extern int pack_fs_repl(uchar *buf, chordID *id, ulong addr, ushort port);
+extern int pack_fs_repl(uchar *buf, chordID *id, unsigned long addr, unsigned
short port);
extern int unpack_fs_repl(Server *srv, int n, uchar *buf);
-extern int pack_stab(uchar *buf, chordID *id, ulong addr, ushort port);
+extern int pack_stab(uchar *buf, chordID *id, unsigned long addr, unsigned
short port);
extern int unpack_stab(Server *srv, int n, uchar *buf);
-extern int pack_stab_repl(uchar *buf, chordID *id, ulong addr, ushort port);
+extern int pack_stab_repl(uchar *buf, chordID *id, unsigned long addr,
unsigned short port);
extern int unpack_stab_repl(Server *srv, int n, uchar *buf);
-extern int pack_notify(uchar *buf, chordID *id, ulong addr, ushort port);
+extern int pack_notify(uchar *buf, chordID *id, unsigned long addr, unsigned
short port);
extern int unpack_notify(Server *srv, int n, uchar *buf);
-int pack_ping(uchar *buf, chordID *id, ulong addr, ushort port, ulong time);
+int pack_ping(uchar *buf, chordID *id, unsigned long addr, unsigned short
port, unsigned long time);
extern int unpack_ping(Server *srv, int n, uchar *buf);
extern int pack_pong(uchar *buf, chordID *id,
- ulong addr, ushort port, ulong time);
+ unsigned long addr, unsigned short port, unsigned long
time);
extern int unpack_pong(Server *srv, int n, uchar *buf);
-extern int pack_fingers_get(uchar *buf, ulong addr, ushort port, Key *key);
+extern int pack_fingers_get(uchar *buf, unsigned long addr, unsigned short
port, Key *key);
extern int unpack_fingers_get(Server *srv, int n, uchar *buf);
extern int pack_fingers_repl(uchar *buf, Server *srv);
extern int unpack_fingers_repl(Server *null, int n, uchar *buf);
@@ -233,24 +233,24 @@
uchar type, byte ttl, byte hops);
extern int unpack_traceroute(Server *srv, int n, uchar *buf);
extern int pack_traceroute_repl(uchar *buf, Server *srv, byte ttl, byte hops,
- ulong *paddr, ushort *pport, int one_hop);
+ unsigned long *paddr, unsigned short *pport,
int one_hop);
extern int unpack_traceroute_repl(Server *srv, int n, uchar *buf);
/* process.c */
extern int process_data(Server *srv, uchar type, byte ttl, chordID *id,
- ushort len, uchar *data);
+ unsigned short len, uchar *data);
extern int process_fs(Server *srv, byte ttl,
- chordID *id, ulong addr, ushort port);
-extern int process_fs_repl(Server *srv, chordID *id, ulong addr, ushort port);
-extern int process_stab(Server *srv, chordID *id, ulong addr, ushort port);
+ chordID *id, unsigned long addr, unsigned short port);
+extern int process_fs_repl(Server *srv, chordID *id, unsigned long addr,
unsigned short port);
+extern int process_stab(Server *srv, chordID *id, unsigned long addr, unsigned
short port);
extern int process_stab_repl(Server *srv, chordID *id,
- ulong addr, ushort port);
-extern int process_notify(Server *srv, chordID *id, ulong addr, ushort port);
+ unsigned long addr, unsigned short port);
+extern int process_notify(Server *srv, chordID *id, unsigned long addr,
unsigned short port);
extern int process_ping(Server *srv, chordID *id,
- ulong addr, ushort port, ulong time);
+ unsigned long addr, unsigned short port, unsigned long
time);
extern int process_pong(Server *srv, chordID *id,
- ulong addr, ushort port, ulong time);
-extern int process_fingers_get(Server *srv, ulong addr, ushort port, Key *key);
+ unsigned long addr, unsigned short port, unsigned long
time);
+extern int process_fingers_get(Server *srv, unsigned long addr, unsigned short
port, Key *key);
extern int process_fingers_repl(Server *srv, uchar ret_code);
extern int process_traceroute(Server *srv, chordID *id, char *buf,
uchar type, byte ttl, byte hops);
@@ -261,23 +261,23 @@
extern void send_raw(Server *srv, in_addr_t addr, in_port_t port,
int n, uchar *buf);
extern void send_data(Server *srv, uchar type, byte ttl, Node *np,
- chordID *id, ushort n, uchar *data);
-extern void send_fs(Server *srv, byte ttl, ulong to_addr, ushort to_port,
- chordID *id, ulong addr, ushort port);
-extern void send_fs_repl(Server *srv, ulong to_addr, ushort to_port,
- chordID *id, ulong addr, ushort port);
-extern void send_stab(Server *srv, ulong to_addr, ushort to_port,
- chordID *id, ulong addr, ushort port);
-extern void send_stab_repl(Server *srv, ulong to_addr, ushort to_port,
- chordID *id, ulong addr, ushort port);
-extern void send_notify(Server *srv, ulong to_addr, ushort to_port,
- chordID *id, ulong addr, ushort port);
-extern void send_ping(Server *srv, ulong to_addr, ushort to_port,
- ulong addr, ushort port, ulong time);
-extern void send_pong(Server *srv, ulong to_addr, ushort to_port, ulong time);
-extern void send_fingers_get(Server *srv, ulong to_addr, ushort to_port,
- ulong addr, ushort port, Key *key);
-extern void send_fingers_repl(Server *srv, ulong to_addr, ushort to_port);
+ chordID *id, unsigned short n, uchar *data);
+extern void send_fs(Server *srv, byte ttl, unsigned long to_addr, unsigned
short to_port,
+ chordID *id, unsigned long addr, unsigned short port);
+extern void send_fs_repl(Server *srv, unsigned long to_addr, unsigned short
to_port,
+ chordID *id, unsigned long addr, unsigned short port);
+extern void send_stab(Server *srv, unsigned long to_addr, unsigned short
to_port,
+ chordID *id, unsigned long addr, unsigned short port);
+extern void send_stab_repl(Server *srv, unsigned long to_addr, unsigned short
to_port,
+ chordID *id, unsigned long addr, unsigned short
port);
+extern void send_notify(Server *srv, unsigned long to_addr, unsigned short
to_port,
+ chordID *id, unsigned long addr, unsigned short port);
+extern void send_ping(Server *srv, unsigned long to_addr, unsigned short
to_port,
+ unsigned long addr, unsigned short port, unsigned long
time);
+extern void send_pong(Server *srv, unsigned long to_addr, unsigned short
to_port, unsigned long time);
+extern void send_fingers_get(Server *srv, unsigned long to_addr, unsigned
short to_port,
+ unsigned long addr, unsigned short port, Key
*key);
+extern void send_fingers_repl(Server *srv, unsigned long to_addr, unsigned
short to_port);
extern void send_traceroute(Server *srv, Finger *f, uchar *buf,
uchar type, byte ttl, byte hops);
extern void send_traceroute_repl(Server *srv, uchar *buf, int ttl,
@@ -297,7 +297,7 @@
int chord_is_local(chordID *x);
/* util.c */
-extern ulong get_current_time(void);
+extern unsigned long get_current_time(void);
extern void update_rtt(long *rtt_avg, long *rtt_std, long new_rtt);
extern chordID rand_ID(void);
extern chordID successor(chordID id, int n);
@@ -327,9 +327,9 @@
extern void print_finger_list(Finger *fhead, char *prefix, char *suffix);
extern void print_server(Server *s, char *prefix, char *suffix);
extern void print_process(Server *srv, char *process_type, chordID *id,
- ulong addr, ushort port);
+ unsigned long addr, unsigned short port);
extern void print_send(Server *srv, char *send_type, chordID *id,
- ulong addr, ushort port);
+ unsigned long addr, unsigned short port);
extern void print_fun(Server *srv, char *fun_name, chordID *id);
void print_current_time(char *prefix, char *suffix);
extern int match_key(Key *key);
=== modified file 'i3/chord/chord_getfingers.c'
--- i3/chord/chord_getfingers.c 2010-02-11 11:49:47 +0000
+++ i3/chord/chord_getfingers.c 2010-02-11 12:12:02 +0000
@@ -24,6 +24,7 @@
#include <fcntl.h>
#include <errno.h>
#include <sys/types.h>
+#include <sys/select.h>
#include <sys/socket.h>
#include <sys/utsname.h>
#include <netinet/in.h>
@@ -43,21 +44,21 @@
struct iditem_ *next;
} IDitem;
-static int unpack_print_getnext(char *buf, int n, ulong *succ_addr,
- ushort *succ_port);
+static int unpack_print_getnext(char *buf, int n, unsigned long *succ_addr,
+ unsigned short *succ_port);
static IDitem *add_chordID(IDitem *head, chordID *id);
static int find_chordID(IDitem *head, chordID *id);
static int recv_packet(int in_sock, fd_set fdset, int nfds,
char *buf, int buf_len,
- ulong chordsrv_addr, ulong chordsrv_port);
+ unsigned long chordsrv_addr, unsigned long
chordsrv_port);
int main(int argc, char *argv[])
{
Key key;
int in_sock, out_sock, len, rc;
int argc_idx = 0, flag_all = FALSE;
- ulong chordsrv_addr, client_addr;
- ushort chordsrv_port, client_port;
+ unsigned long chordsrv_addr, client_addr;
+ unsigned short chordsrv_port, client_port;
struct sockaddr_in chordsrv;
struct sockaddr_in sin, sout;
struct hostent *h;
@@ -90,7 +91,7 @@
assert(h->h_length == sizeof(long));
memcpy((char *) &chordsrv_addr, h->h_addr_list[0], h->h_length);
chordsrv_addr = ntohl(chordsrv_addr);
- chordsrv_port = (ushort) atoi(argv[argc_idx + 2]);
+ chordsrv_port = (unsigned short) atoi(argv[argc_idx + 2]);
/* get client's address */
client_addr = ntohl(get_addr());
@@ -209,17 +210,17 @@
* number in succ_addr and succ_port variables
*/
static int unpack_print_getnext(char *buf, int n,
- ulong *succ_addr, ushort *succ_port)
+ unsigned long *succ_addr, unsigned short
*succ_port)
{
chordID id;
char type;
- ulong addr, rtt_avg, rtt_dev;
- ushort port, npings;
+ unsigned long addr, rtt_avg, rtt_dev;
+ unsigned short port, npings;
int len, i, ret_code;
struct in_addr ia;
static IDitem *head_list = NULL;
- len = unpack((uchar *) buf, "cxls", &type, &id, (ulong *) &addr, (ushort
*) &port);
+ len = unpack((uchar *) buf, "cxls", &type, &id, (unsigned long *) &addr,
(unsigned short *) &port);
assert(type == CHORD_FINGERS_REPL);
if (find_chordID(head_list, &id) == TRUE) {
@@ -291,7 +292,7 @@
static int recv_packet(int in_sock, fd_set fdset, int nfds,
char *buf, int buf_len,
- ulong chordsrv_addr, ulong chordsrv_port)
+ unsigned long chordsrv_addr, unsigned long
chordsrv_port)
{
fd_set readset;
int nfound, from_len, len;
@@ -320,7 +321,7 @@
/* this is the reply from the Chord node */
from_len = sizeof(from);
len = recvfrom(in_sock, buf, buf_len, 0,
- (struct sockaddr *) &from, (uint *) &from_len);
+ (struct sockaddr *) &from, (unsigned int *)
&from_len);
if (len < 0) {
if (errno != EAGAIN) {
printf("recvfrom failed.");
=== modified file 'i3/chord/chord_traceroute.c'
--- i3/chord/chord_traceroute.c 2010-02-11 11:49:47 +0000
+++ i3/chord/chord_traceroute.c 2010-02-11 12:12:02 +0000
@@ -21,6 +21,7 @@
#include <fcntl.h>
#include <errno.h>
#include <sys/types.h>
+#include <sys/select.h>
#include <sys/socket.h>
#include <sys/utsname.h>
#include <netinet/in.h>
@@ -40,25 +41,25 @@
struct iditem_ *next;
} IDitem;
-/*static int unpack_print_getnext(char *buf, int n, ulong *succ_addr,
- * ushort *succ_port);*/
+/*static int unpack_print_getnext(char *buf, int n, unsigned long *succ_addr,
+ * unsigned short *succ_port);*/
/*static IDitem *add_chordID(IDitem *head, chordID *id);*/
/*static int find_chordID(IDitem *head, chordID *id);*/
static int recv_packet(int in_sock, fd_set fdset, int nfds,
char *buf, int buf_len,
- ulong chordsrv_addr, ulong chordsrv_port);
+ unsigned long chordsrv_addr, unsigned long
chordsrv_port);
static int pack_client_traceroute(uchar *buf, byte ttl, chordID *id,
- ulong client_addr, ushort client_port);
+ unsigned long client_addr, unsigned short
client_port);
static int unpack_client_traceroute_repl(char *buf, int n, int orig_ttl,
- ulong chordsrv_addr,
- ushort chordsrv_port);
+ unsigned long chordsrv_addr,
+ unsigned short chordsrv_port);
int main(int argc, char *argv[])
{
Key key;
int in_sock, out_sock, len, rc;
- ulong chordsrv_addr, client_addr;
- ushort chordsrv_port, client_port;
+ unsigned long chordsrv_addr, client_addr;
+ unsigned short chordsrv_port, client_port;
struct sockaddr_in chordsrv;
struct sockaddr_in sin, sout;
struct hostent *h;
@@ -81,7 +82,7 @@
tmp[0] = argv[1][2 * i];
tmp[1] = argv[1][2 * i + 1];
tmp[2] = 0;
- sscanf(tmp, "%x", (uint *) &id.x[i]);
+ sscanf(tmp, "%x", (unsigned int *) &id.x[i]);
}
/* chord server address and port number */
@@ -93,7 +94,7 @@
assert(h->h_length == sizeof(long));
memcpy((char *) &chordsrv_addr, h->h_addr_list[0], h->h_length);
chordsrv_addr = ntohl(chordsrv_addr);
- chordsrv_port = (ushort) atoi(argv[3]);
+ chordsrv_port = (unsigned short) atoi(argv[3]);
/* get client's address */
client_addr = ntohl(get_addr());
@@ -203,14 +204,14 @@
* number in succ_addr and succ_port variables
*/
static int unpack_client_traceroute_repl(char *buf, int n, int orig_ttl,
- ulong chordsrv_addr,
- ushort chordsrv_port)
+ unsigned long chordsrv_addr,
+ unsigned short chordsrv_port)
{
chordID id;
char type;
- ulong addr;
- ushort port;
- ulong rtt_avg, rtt_dev;
+ unsigned long addr;
+ unsigned short port;
+ unsigned long rtt_avg, rtt_dev;
int len;
uchar ttl, hops;
struct in_addr ia;
@@ -256,7 +257,7 @@
static int recv_packet(int in_sock, fd_set fdset, int nfds,
char *buf, int buf_len,
- ulong chordsrv_addr, ulong chordsrv_port)
+ unsigned long chordsrv_addr, unsigned long
chordsrv_port)
{
fd_set readset;
int nfound, from_len, len;
@@ -285,7 +286,7 @@
/* this is the reply from the Chord node */
from_len = sizeof(from);
len = recvfrom(in_sock, buf, buf_len, 0,
- (struct sockaddr *) &from, (uint *) &from_len);
+ (struct sockaddr *) &from, (unsigned int *)
&from_len);
if (len < 0) {
if (errno != EAGAIN) {
printf("recvfrom failed; ");
@@ -312,17 +313,17 @@
* forward path. hops should be initialized to 0 by the clients.
* ID target_id; target ID for traceroute.
* Node prev_node; previous node (ie., the node which forwarded the packet)
- * ulong rtt; rtt...
- * ulong dev; ... and std dev frm previous node to this node (in usec)
+ * unsigned long rtt; rtt...
+ * unsigned long dev; ... and std dev frm previous node to this node (in
usec)
* Node crt_node; this node
* (list of addresses/ports of the nodes along the traceroute path
* up to this node)
- * ulong addr; address...
- * ushort port; ... and port number of the client
+ * unsigned long addr; address...
+ * unsigned short port; ... and port number of the client
* ....
*/
static int pack_client_traceroute(uchar *buf, uchar ttl, chordID *id,
- ulong client_addr, ushort client_port)
+ unsigned long client_addr, unsigned short
client_port)
{
int n = 0;
=== modified file 'i3/chord/gen_conf.c'
--- i3/chord/gen_conf.c 2010-02-11 11:49:47 +0000
+++ i3/chord/gen_conf.c 2010-02-11 12:12:02 +0000
@@ -1,3 +1,7 @@
+
+/* required for ifreq and h_addr hostent */
+#define _BSD_SOURCE
+
#include <stdlib.h>
#include <stdio.h>
#include <sys/types.h>
@@ -24,7 +28,7 @@
#define NEWS
/* get_addr: get IP address of server */
-ulong get_addr1(char *name, int *ok_flag)
+unsigned long get_addr1(char *name, int *ok_flag)
{
int i, tempfd, ret;
struct sockaddr_in tmp_addr;
@@ -51,18 +55,18 @@
*ok_flag = 0;
return 0;
}
- for (i = 0; i < hptr->h_length / sizeof(ulong); i++) {
+ for (i = 0; i < hptr->h_length / sizeof(unsigned long); i++) {
struct in_addr ia;
- ulong *addrptr;
+ unsigned long *addrptr;
- addrptr = (ulong *) hptr->h_addr_list[i];
+ addrptr = (unsigned long *) hptr->h_addr_list[i];
ia.s_addr = *addrptr;
//printf("Addr %d = %s; ", i, inet_ntoa(ia));
}
- if (*((ulong *) hptr->h_addr) != inet_addr("127.0.0.1")) {
- return *((ulong *) hptr->h_addr);
+ if (*((unsigned long *) hptr->h_addr) != inet_addr("127.0.0.1")) {
+ return *((unsigned long *) hptr->h_addr);
}
// if not, ioctl on ethernet interface.
=== modified file 'i3/chord/pack.c'
--- i3/chord/pack.c 2010-02-11 11:49:47 +0000
+++ i3/chord/pack.c 2010-02-11 12:12:02 +0000
@@ -11,8 +11,8 @@
char *p;
uchar *bp;
chordID *id;
- ushort s;
- ulong l;
+ unsigned short s;
+ unsigned long l;
bp = buf;
va_start(args, fmt);
@@ -24,14 +24,14 @@
case 's': /* short */
s = va_arg(args, int);
s = htons(s);
- memmove(bp, (char *) &s, sizeof(ushort));
- bp += sizeof(ushort);
+ memmove(bp, (char *) &s, sizeof(unsigned short));
+ bp += sizeof(unsigned short);
break;
case 'l': /* long */
- l = va_arg(args, ulong);
+ l = va_arg(args, unsigned long);
l = htonl(l);
- memmove(bp, (char *) &l, sizeof(ulong));
- bp += sizeof(ulong);
+ memmove(bp, (char *) &l, sizeof(unsigned long));
+ bp += sizeof(unsigned long);
break;
case 'x': /* id */
id = va_arg(args, chordID *);
@@ -56,8 +56,8 @@
char *p;
uchar *bp, *pc;
chordID *id;
- ushort *ps;
- ulong *pl;
+ unsigned short *ps;
+ unsigned long *pl;
bp = buf;
va_start(args, fmt);
@@ -68,14 +68,14 @@
*pc = *bp++;
break;
case 's': /* short */
- ps = va_arg(args, ushort *);
- *ps = ntohs(*(ushort *) bp);
- bp += sizeof(ushort);
+ ps = va_arg(args, unsigned short *);
+ *ps = ntohs(*(unsigned short *) bp);
+ bp += sizeof(unsigned short);
break;
case 'l': /* long */
- pl = va_arg(args, ulong *);
- *pl = ntohl(*(ulong *) bp);
- bp += sizeof(ulong);
+ pl = va_arg(args, unsigned long *);
+ *pl = ntohl(*(unsigned long *) bp);
+ bp += sizeof(unsigned long);
break;
case 'x': /* id */
id = va_arg(args, chordID *);
@@ -104,10 +104,10 @@
len += sizeof(char);
break;
case 's': /* short */
- len += sizeof(ushort);
+ len += sizeof(unsigned short);
break;
case 'l': /* long */
- len += sizeof(ulong);
+ len += sizeof(unsigned long);
break;
case 'x': /* id */
len += ID_LEN;
@@ -162,7 +162,7 @@
/* pack_data: pack data packet */
int pack_data(uchar *buf, uchar type, byte ttl, chordID *id,
- ushort len, uchar *data)
+ unsigned short len, uchar *data)
{
int n;
@@ -183,7 +183,7 @@
byte ttl;
int len;
chordID id;
- ushort pkt_len;
+ unsigned short pkt_len;
len = unpack(buf, "ccxs", &type, &ttl, id.x, &pkt_len);
if (len < 0 || len + pkt_len != n) {
@@ -201,7 +201,7 @@
/**********************************************************************/
/* pack_fs: pack find_successor packet */
-int pack_fs(uchar *buf, byte ttl, chordID *id, ulong addr, ushort port)
+int pack_fs(uchar *buf, byte ttl, chordID *id, unsigned long addr, unsigned
short port)
{
return pack(buf, "ccxls", CHORD_FS, ttl, id, addr, port);
}
@@ -213,8 +213,8 @@
{
uchar type;
byte ttl;
- ulong addr;
- ushort port;
+ unsigned long addr;
+ unsigned short port;
chordID id;
if (unpack(buf, "ccxls", &type, &ttl, &id, &addr, &port) != n) {
@@ -232,7 +232,7 @@
/**********************************************************************/
/* pack_fs_repl: pack find_successor reply packet */
-int pack_fs_repl(uchar *buf, chordID *id, ulong addr, ushort port)
+int pack_fs_repl(uchar *buf, chordID *id, unsigned long addr, unsigned short
port)
{
return pack(buf, "cxls", CHORD_FS_REPL, id, addr, port);
}
@@ -243,8 +243,8 @@
int unpack_fs_repl(Server *srv, int n, uchar *buf)
{
uchar type;
- ulong addr;
- ushort port;
+ unsigned long addr;
+ unsigned short port;
chordID id;
if (unpack(buf, "cxls", &type, &id, &addr, &port) != n) {
@@ -257,7 +257,7 @@
/**********************************************************************/
/* pack_stab: pack stabilize packet */
-int pack_stab(uchar *buf, chordID *id, ulong addr, ushort port)
+int pack_stab(uchar *buf, chordID *id, unsigned long addr, unsigned short port)
{
return pack(buf, "cxls", CHORD_STAB, id, addr, port);
}
@@ -268,8 +268,8 @@
int unpack_stab(Server *srv, int n, uchar *buf)
{
uchar type;
- ulong addr;
- ushort port;
+ unsigned long addr;
+ unsigned short port;
chordID id;
if (unpack(buf, "cxls", &type, &id, &addr, &port) != n) {
@@ -282,7 +282,7 @@
/**********************************************************************/
/* pack_stab_repl: pack stabilize reply packet */
-int pack_stab_repl(uchar *buf, chordID *id, ulong addr, ushort port)
+int pack_stab_repl(uchar *buf, chordID *id, unsigned long addr, unsigned short
port)
{
return pack(buf, "cxls", CHORD_STAB_REPL, id, addr, port);
}
@@ -293,8 +293,8 @@
int unpack_stab_repl(Server *srv, int n, uchar *buf)
{
uchar type;
- ulong addr;
- ushort port;
+ unsigned long addr;
+ unsigned short port;
chordID id;
if (unpack(buf, "cxls", &type, &id, &addr, &port) != n) {
@@ -307,7 +307,7 @@
/**********************************************************************/
/* pack_notify: pack notify packet */
-int pack_notify(uchar *buf, chordID *id, ulong addr, ushort port)
+int pack_notify(uchar *buf, chordID *id, unsigned long addr, unsigned short
port)
{
return pack(buf, "cxls", CHORD_NOTIFY, id, addr, port);
}
@@ -318,8 +318,8 @@
int unpack_notify(Server *srv, int n, uchar *buf)
{
uchar type;
- ulong addr;
- ushort port;
+ unsigned long addr;
+ unsigned short port;
chordID id;
if (unpack(buf, "cxls", &type, &id, &addr, &port) != n) {
@@ -332,7 +332,7 @@
/**********************************************************************/
/* pack_ping: pack ping packet */
-int pack_ping(uchar *buf, chordID *id, ulong addr, ushort port, ulong time)
+int pack_ping(uchar *buf, chordID *id, unsigned long addr, unsigned short
port, unsigned long time)
{
return pack(buf, "cxlsl", CHORD_PING, id, addr, port, time);
}
@@ -344,9 +344,9 @@
{
uchar type;
chordID id;
- ulong addr;
- ushort port;
- ulong time;
+ unsigned long addr;
+ unsigned short port;
+ unsigned long time;
if (unpack(buf, "cxlsl", &type, &id, &addr, &port, &time) != n) {
return -1;
@@ -358,7 +358,7 @@
/**********************************************************************/
/* pack_pong: pack pong packet */
-int pack_pong(uchar *buf, chordID *id, ulong addr, ushort port, ulong time)
+int pack_pong(uchar *buf, chordID *id, unsigned long addr, unsigned short
port, unsigned long time)
{
return pack(buf, "cxlsl", CHORD_PONG, id, addr, port, time);
}
@@ -369,10 +369,10 @@
int unpack_pong(Server *srv, int n, uchar *buf)
{
uchar type;
- ulong addr;
- ushort port;
+ unsigned long addr;
+ unsigned short port;
chordID id;
- ulong time;
+ unsigned long time;
if (unpack(buf, "cxlsl", &type, &id, &addr, &port, &time) != n) {
return -1;
@@ -385,7 +385,7 @@
/**********************************************************************/
/* pack_fingers_get: pack get fingers packet */
-int pack_fingers_get(uchar *buf, ulong addr, ushort port, Key *key)
+int pack_fingers_get(uchar *buf, unsigned long addr, unsigned short port, Key
*key)
{
return pack(buf, "cxls", CHORD_FINGERS_GET, key, addr, port);
}
@@ -397,8 +397,8 @@
{
uchar type;
Key key;
- ulong addr;
- ushort port;
+ unsigned long addr;
+ unsigned short port;
if (unpack(buf, "cxls", &type, &key, &addr, &port) != n) {
return -1;
@@ -457,13 +457,13 @@
* forward path. hops should be initialized to 0 by the clients.
* ID target_id; target ID for traceroute.
* Node prev_node; previous node (ie., the node which forwarded the packet)
- * ulong rtt; rtt...
- * ulong dev; ... and std dev frm previous node to this node (in usec)
+ * unsigned long rtt; rtt...
+ * unsigned long dev; ... and std dev frm previous node to this node (in
usec)
* Node crt_node; this node
* (list of addresses/ports of the nodes along the traceroute path
* up to this node)
- * ulong addr; address...
- * ushort port; ... and port number of the client
+ * unsigned long addr; address...
+ * unsigned short port; ... and port number of the client
* ....
*/
int pack_traceroute(uchar *buf, Server *srv, Finger *f,
@@ -526,17 +526,17 @@
* the packet is dropped.
* ID target_id; target ID for traceroute.
* Node nl_node; next-to-last hop on traceroute path
- * ulong rtt; rtt...
- * ulong dev; ... and std dev from next-to-last hop to the last hop
+ * unsigned long rtt; rtt...
+ * unsigned long dev; ... and std dev from next-to-last hop to the last hop
* Node l_node; last node of traceroute path
* (list of addresses/ports of the nodes along the traceroute path
* up to this node, starting with the client)
- * ulong addr; address...
- * ushort port; ... and port number of the client
+ * unsigned long addr; address...
+ * unsigned short port; ... and port number of the client
* ....
*/
int pack_traceroute_repl(uchar *buf, Server *srv, byte ttl, byte hops,
- ulong *paddr, ushort *pport, int one_hop)
+ unsigned long *paddr, unsigned short *pport, int
one_hop)
{
int n = 0;
=== modified file 'i3/chord/process.c'
--- i3/chord/process.c 2010-02-11 11:49:47 +0000
+++ i3/chord/process.c 2010-02-11 12:12:02 +0000
@@ -4,7 +4,7 @@
#include "chord.h"
int process_data(Server *srv, uchar type,
- byte ttl, chordID *id, ushort len, uchar *data)
+ byte ttl, chordID *id, unsigned short len, uchar *data)
{
Node *np;
Finger *pf, *sf;
@@ -50,7 +50,7 @@
/**********************************************************************/
-int process_fs(Server *srv, byte ttl, chordID *id, ulong addr, ushort port)
+int process_fs(Server *srv, byte ttl, chordID *id, unsigned long addr,
unsigned short port)
{
Node *succ, *np;
@@ -77,7 +77,7 @@
/**********************************************************************/
-int process_fs_repl(Server *srv, chordID *id, ulong addr, ushort port)
+int process_fs_repl(Server *srv, chordID *id, unsigned long addr, unsigned
short port)
{
int fnew;
@@ -97,7 +97,7 @@
/**********************************************************************/
-int process_stab(Server *srv, chordID *id, ulong addr, ushort port)
+int process_stab(Server *srv, chordID *id, unsigned long addr, unsigned short
port)
{
Finger *pred = pred_finger(srv);
int fnew;
@@ -114,7 +114,7 @@
/**********************************************************************/
-int process_stab_repl(Server *srv, chordID *id, ulong addr, ushort port)
+int process_stab_repl(Server *srv, chordID *id, unsigned long addr, unsigned
short port)
{
Finger *succ;
int fnew;
@@ -137,7 +137,7 @@
/**********************************************************************/
-int process_notify(Server *srv, chordID *id, ulong addr, ushort port)
+int process_notify(Server *srv, chordID *id, unsigned long addr, unsigned
short port)
{
int fnew;
@@ -152,7 +152,7 @@
/**********************************************************************/
-int process_ping(Server *srv, chordID *id, ulong addr, ushort port, ulong time)
+int process_ping(Server *srv, chordID *id, unsigned long addr, unsigned short
port, unsigned long time)
{
int fnew;
Finger *pred;
@@ -174,10 +174,10 @@
/**********************************************************************/
-int process_pong(Server *srv, chordID *id, ulong addr, ushort port, ulong time)
+int process_pong(Server *srv, chordID *id, unsigned long addr, unsigned short
port, unsigned long time)
{
Finger *f, *pred, *newpred;
- ulong new_rtt;
+ unsigned long new_rtt;
int fnew;
CHORD_DEBUG(5, print_process(srv, "process_pong", id, addr, port));
@@ -202,7 +202,7 @@
/**********************************************************************/
-int process_fingers_get(Server *srv, ulong addr, ushort port, Key *key)
+int process_fingers_get(Server *srv, unsigned long addr, unsigned short port,
Key *key)
{
CHORD_DEBUG(5, print_process(srv, "process_fingers_get", NULL, addr,
port));
if (match_key(key) == 0) {
=== modified file 'i3/chord/sendpkt.c'
--- i3/chord/sendpkt.c 2010-02-11 11:49:47 +0000
+++ i3/chord/sendpkt.c 2010-02-11 12:12:02 +0000
@@ -14,7 +14,7 @@
#include "chord.h"
void send_data(Server *srv, uchar type, byte ttl, Node *np, chordID *id,
- ushort n, uchar *data)
+ unsigned short n, uchar *data)
{
byte buf[BUFSIZE];
@@ -25,8 +25,8 @@
/**********************************************************************/
-void send_fs(Server *srv, byte ttl, ulong to_addr, ushort to_port,
- chordID *id, ulong addr, ushort port)
+void send_fs(Server *srv, byte ttl, unsigned long to_addr, unsigned short
to_port,
+ chordID *id, unsigned long addr, unsigned short port)
{
byte buf[BUFSIZE];
@@ -36,8 +36,8 @@
/**********************************************************************/
-void send_fs_repl(Server *srv, ulong to_addr, ushort to_port,
- chordID *id, ulong addr, ushort port)
+void send_fs_repl(Server *srv, unsigned long to_addr, unsigned short to_port,
+ chordID *id, unsigned long addr, unsigned short port)
{
byte buf[BUFSIZE];
@@ -47,8 +47,8 @@
/**********************************************************************/
-void send_stab(Server *srv, ulong to_addr, ushort to_port,
- chordID *id, ulong addr, ushort port)
+void send_stab(Server *srv, unsigned long to_addr, unsigned short to_port,
+ chordID *id, unsigned long addr, unsigned short port)
{
byte buf[BUFSIZE];
@@ -58,8 +58,8 @@
/**********************************************************************/
-void send_stab_repl(Server *srv, ulong to_addr, ushort to_port,
- chordID *id, ulong addr, ushort port)
+void send_stab_repl(Server *srv, unsigned long to_addr, unsigned short to_port,
+ chordID *id, unsigned long addr, unsigned short port)
{
byte buf[BUFSIZE];
@@ -69,8 +69,8 @@
/**********************************************************************/
-void send_notify(Server *srv, ulong to_addr, ushort to_port,
- chordID *id, ulong addr, ushort port)
+void send_notify(Server *srv, unsigned long to_addr, unsigned short to_port,
+ chordID *id, unsigned long addr, unsigned short port)
{
byte buf[BUFSIZE];
@@ -80,8 +80,8 @@
/**********************************************************************/
-void send_ping(Server *srv, ulong to_addr, ushort to_port,
- ulong addr, ushort port, ulong time)
+void send_ping(Server *srv, unsigned long to_addr, unsigned short to_port,
+ unsigned long addr, unsigned short port, unsigned long time)
{
byte buf[BUFSIZE];
@@ -93,7 +93,7 @@
/**********************************************************************/
-void send_pong(Server *srv, ulong to_addr, ushort to_port, ulong time)
+void send_pong(Server *srv, unsigned long to_addr, unsigned short to_port,
unsigned long time)
{
byte buf[BUFSIZE];
@@ -106,8 +106,8 @@
/**********************************************************************/
-void send_fingers_get(Server *srv, ulong to_addr, ushort to_port,
- ulong addr, ushort port, Key *key)
+void send_fingers_get(Server *srv, unsigned long to_addr, unsigned short
to_port,
+ unsigned long addr, unsigned short port, Key *key)
{
byte buf[BUFSIZE];
@@ -118,7 +118,7 @@
/**********************************************************************/
-void send_fingers_repl(Server *srv, ulong to_addr, ushort to_port)
+void send_fingers_repl(Server *srv, unsigned long to_addr, unsigned short
to_port)
{
byte buf[BUFSIZE];
@@ -143,8 +143,8 @@
void send_traceroute_repl(Server *srv, uchar *buf, int ttl,
int hops, int one_hop)
{
- ulong to_addr;
- ushort to_port;
+ unsigned long to_addr;
+ unsigned short to_port;
int n;
CHORD_DEBUG(5, print_send(srv, "send_traceroute_repl",
=== modified file 'i3/chord/util.c'
--- i3/chord/util.c 2010-02-11 11:49:47 +0000
+++ i3/chord/util.c 2010-02-11 12:12:02 +0000
@@ -462,7 +462,7 @@
}
void print_process(Server *srv, char *process_type, chordID *id,
- ulong addr, ushort port)
+ unsigned long addr, unsigned short port)
{
#define TYPE_LEN 16
int i = TYPE_LEN - strlen(process_type);
@@ -491,7 +491,7 @@
}
void print_send(Server *srv, char *send_type, chordID *id,
- ulong addr, ushort port)
+ unsigned long addr, unsigned short port)
{
int i = TYPE_LEN - strlen(send_type);
@@ -527,12 +527,12 @@
print_current_time(" @ ", "\n");
}
-ulong get_current_time()
+unsigned long get_current_time()
{
#ifdef SIM_CHORD
- return (ulong) sim_get_time();
+ return (unsigned long) sim_get_time();
#else
- return (ulong) wall_time();
+ return (unsigned long) wall_time();
#endif
}
=== modified file 'i3/i3/i3_addr.c'
--- i3/i3/i3_addr.c 2010-02-11 11:49:47 +0000
+++ i3/i3/i3_addr.c 2010-02-11 12:12:02 +0000
@@ -478,7 +478,7 @@
int addr_equal(i3_addr *a1, i3_addr *a2)
{
#ifndef __CYGWIN__
- uint i;
+ unsigned int i;
#endif
if (a1->type != a2->type) {
@@ -564,7 +564,7 @@
void printf_id(ID *id, int indent)
{
- uint i;
+ unsigned int i;
char buf[INDENT_BUF_LEN];
memset(buf, ' ', indent);
@@ -584,7 +584,7 @@
void printf_i3_addr(i3_addr *addr, int indent)
{
#ifndef __CYGWIN__
- uint i;
+ unsigned int i;
#endif
char buf[INDENT_BUF_LEN];
struct in_addr ia;
=== modified file 'i3/i3/i3_id.c'
--- i3/i3/i3_id.c 2010-02-11 11:49:47 +0000
+++ i3/i3/i3_id.c 2010-02-11 12:12:02 +0000
@@ -130,7 +130,7 @@
*/
char *sprintf_i3_id(char *s, const ID *id)
{
- uint i;
+ unsigned int i;
*s = 0;
for (i = 0; i < sizeof(ID); i++) {
@@ -148,7 +148,7 @@
*/
ID *sscanf_i3_id(char *id_str, ID *id)
{
- uint i;
+ unsigned int i;
int c;
for (i = 0; i < sizeof(ID); i++) {
sscanf(id_str, "%02x", &c);
@@ -160,7 +160,7 @@
char *sprintf_i3_key(char *s, const Key *key)
{
- uint i;
+ unsigned int i;
*s = 0;
for (i = 0; i < sizeof(Key); i++) {
@@ -178,7 +178,7 @@
*/
Key *sscanf_i3_key(char *id_str, Key *key)
{
- uint i;
+ unsigned int i;
int c;
for (i = 0; i < sizeof(Key); i++) {
sscanf(id_str, "%02x", &c);
@@ -196,7 +196,7 @@
void fprintf_i3_id(FILE *fp, ID *id, int indent)
{
char buf[INDENT_BUF_LEN];
- uint i;
+ unsigned int i;
memset(buf, ' ', INDENT_BUF_LEN);
buf[indent] = 0;
@@ -211,7 +211,7 @@
void printf_i3_id(ID *id, int indent)
{
char buf[INDENT_BUF_LEN];
- uint i;
+ unsigned int i;
memset(buf, ' ', INDENT_BUF_LEN);
buf[indent] = 0;
=== modified file 'i3/i3/i3_stack.c'
--- i3/i3/i3_stack.c 2010-02-11 11:49:47 +0000
+++ i3/i3/i3_stack.c 2010-02-11 12:12:02 +0000
@@ -227,7 +227,7 @@
{
char buf[INDENT_BUF_LEN];
int i;
- uint k;
+ unsigned int k;
memset(buf, ' ', INDENT_BUF_LEN);
buf[indent] = 0;
=== modified file 'i3/i3/i3_trigger.c'
--- i3/i3/i3_trigger.c 2010-02-11 11:49:47 +0000
+++ i3/i3/i3_trigger.c 2010-02-11 12:12:02 +0000
@@ -426,7 +426,7 @@
void printf_i3_key(uint8_t *t, int indent)
{
char buf[INDENT_BUF_LEN];
- uint i;
+ unsigned int i;
memset(buf, ' ', INDENT_BUF_LEN);
buf[indent] = 0;
=== modified file 'i3/i3_client/http.c'
--- i3/i3_client/http.c 2010-02-11 11:49:47 +0000
+++ i3/i3_client/http.c 2010-02-11 12:12:02 +0000
@@ -9,6 +9,9 @@
*
*/
+/* required for h_addr member of hostent */
+#define _BSD_SOURCE
+
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
=== modified file 'i3/i3_client/i3_client_api_ctx.c'
--- i3/i3_client/i3_client_api_ctx.c 2010-02-11 11:49:47 +0000
+++ i3/i3_client/i3_client_api_ctx.c 2010-02-11 12:12:02 +0000
@@ -18,7 +18,7 @@
#include <errno.h>
#include <time.h>
#include <stdio.h> // printf()
-#include <string.h> // strcasecmp()
+#include <strings.h> // strcasecmp()
#include <stdlib.h> // exit()
#ifdef _WIN32
// stg: win does not have strcasecmp():
=== modified file 'i3/utils/inetfns.c'
--- i3/utils/inetfns.c 2010-02-11 11:49:47 +0000
+++ i3/utils/inetfns.c 2010-02-11 12:12:02 +0000
@@ -1,3 +1,7 @@
+
+/* required for ifreq */
+#define _BSD_SOURCE
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Other related posts:
- » [hipl-commit] [trunk] Rev 3608: Replace ushort/uint/ulong (in i3) with their standard counterparts. - Mircea Gherzan
