From e52743fe25e918181952fefd3ffb9d5c6cf148d1 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 27 Feb 2008 16:12:55 -0800 Subject: [PATCH] client: ipquad printf cleanups --- src/kernel/messenger.c | 45 ++++++++++++++++++++--------------------- src/kernel/mon_client.c | 5 ++--- src/kernel/super.c | 3 ++- src/kernel/super.h | 7 +++++++ 4 files changed, 33 insertions(+), 27 deletions(-) diff --git a/src/kernel/messenger.c b/src/kernel/messenger.c index 8f85c88495aba..1370eca0840db 100644 --- a/src/kernel/messenger.c +++ b/src/kernel/messenger.c @@ -25,6 +25,13 @@ static void try_write(struct work_struct *); static void try_accept(struct work_struct *); +#define IPQUADPORT(n) \ + (unsigned int)((n.sin_addr.s_addr)>>24)&0xFF, \ + (unsigned int)((n.sin_addr.s_addr)>>16)&0xFF, \ + (unsigned int)((n.sin_addr.s_addr)>>8)&0xFF, \ + (unsigned int)((n.sin_addr.s_addr)&0xFF), \ + (unsigned int)(ntohs(n.sin_port)) + /* * connections @@ -267,10 +274,9 @@ void ceph_queue_read(struct ceph_connection *con) */ static void ceph_send_fault(struct ceph_connection *con) { - derr(1, "ceph_send_fault %p state %lu to peer %x:%d\n", + derr(1, "ceph_send_fault %p state %lu to peer %u.%u.%u.%u:%u\n", con, con->state, - ntohl(con->peer_addr.ipaddr.sin_addr.s_addr), - ntohs(con->peer_addr.ipaddr.sin_port)); + IPQUADPORT(con->peer_addr.ipaddr)); if (!test_and_clear_bit(CONNECTING, &con->state)){ derr(1, "CONNECTING bit not set\n"); @@ -674,9 +680,8 @@ done: * safe. */ con->msgr->inst.addr.ipaddr = con->in_msg->hdr.dst.addr.ipaddr; - dout(10, "read_message_partial learned my addr is %x:%d\n", - ntohl(con->msgr->inst.addr.ipaddr.sin_addr.s_addr), - ntohs(con->msgr->inst.addr.ipaddr.sin_port)); + dout(10, "read_message_partial learned my addr is %u.%u.%u.%u:%u\n", + IPQUADPORT(con->msgr->inst.addr.ipaddr)); } return 1; /* done! */ @@ -769,12 +774,10 @@ static void process_connect(struct ceph_connection *con) dout(20, "process_connect on %p tag %d\n", con, (int)con->in_tag); clear_bit(CONNECTING, &con->state); if (!ceph_entity_addr_is_local(con->peer_addr, con->actual_peer_addr)) { - derr(1, "process_connect wrong peer, want %x:%d/%d, got %x:%d/%d, wtf\n", - ntohl(con->peer_addr.ipaddr.sin_addr.s_addr), - ntohs(con->peer_addr.ipaddr.sin_port), + derr(1, "process_connect wrong peer, want %u.%u.%u.%u:%u/%d, got %u.%u.%u.%u:%u/%d, wtf\n", + IPQUADPORT(con->peer_addr.ipaddr), con->peer_addr.nonce, - ntohl(con->actual_peer_addr.ipaddr.sin_addr.s_addr), - ntohs(con->actual_peer_addr.ipaddr.sin_port), + IPQUADPORT(con->actual_peer_addr.ipaddr), con->actual_peer_addr.nonce); con->in_tag = CEPH_MSGR_TAG_REJECT; } @@ -1095,9 +1098,8 @@ void ceph_messenger_mark_down(struct ceph_messenger *msgr, struct ceph_entity_ad { struct ceph_connection *con; - dout(1, "mark_down peer %x:%d\n", - ntohl(addr->ipaddr.sin_addr.s_addr), - ntohs(addr->ipaddr.sin_port)); + dout(1, "mark_down peer %u.%u.%u.%u:%u\n", + IPQUADPORT(addr->ipaddr)); spin_lock(&msgr->con_lock); con = __get_connection(msgr, addr); @@ -1137,21 +1139,18 @@ int ceph_msg_send(struct ceph_messenger *msgr, struct ceph_msg *msg, unsigned lo con = __get_connection(msgr, &msg->hdr.dst.addr); if (con) { put_connection(newcon); - dout(10, "ceph_msg_send (lost race and) had connection %p to peer %x:%d\n", con, - ntohl(msg->hdr.dst.addr.ipaddr.sin_addr.s_addr), - ntohs(msg->hdr.dst.addr.ipaddr.sin_port)); + dout(10, "ceph_msg_send (lost race and) had connection %p to peer %u.%u.%u.%u:%u\n", con, + IPQUADPORT(msg->hdr.dst.addr.ipaddr)); } else { con = newcon; con->peer_addr = msg->hdr.dst.addr; __add_connection(msgr, con); - dout(5, "ceph_msg_send new connection %p to peer %x:%d\n", con, - ntohl(msg->hdr.dst.addr.ipaddr.sin_addr.s_addr), - ntohs(msg->hdr.dst.addr.ipaddr.sin_port)); + dout(5, "ceph_msg_send new connection %p to peer %u.%u.%u.%u:%u\n", con, + IPQUADPORT(msg->hdr.dst.addr.ipaddr)); } } else { - dout(10, "ceph_msg_send had connection %p to peer %x:%d\n", con, - ntohl(msg->hdr.dst.addr.ipaddr.sin_addr.s_addr), - ntohs(msg->hdr.dst.addr.ipaddr.sin_port)); + dout(10, "ceph_msg_send had connection %p to peer %u.%u.%u.%u:%u\n", con, + IPQUADPORT(msg->hdr.dst.addr.ipaddr)); } spin_unlock(&msgr->con_lock); con->delay = timeout; diff --git a/src/kernel/mon_client.c b/src/kernel/mon_client.c index 404c37de5f10c..60faddaa0974e 100644 --- a/src/kernel/mon_client.c +++ b/src/kernel/mon_client.c @@ -34,9 +34,8 @@ struct ceph_monmap *ceph_monmap_decode(void *p, void *end) } memcpy(m->mon_inst, p, end-p); for (i=0; inum_mon; i++) { - dout(30, "monmap_decode mon%d is %x:%d\n", i, - ntohl(m->mon_inst[i].addr.ipaddr.sin_addr.s_addr), - ntohs(m->mon_inst[i].addr.ipaddr.sin_port)); + dout(30, "monmap_decode mon%d is %u.%u.%u.%u:%u\n", i, + IPQUADPORT(m->mon_inst[i].addr.ipaddr)); } dout(30, "monmap_decode got epoch %d, num_mon %d\n", m->epoch, m->num_mon); diff --git a/src/kernel/super.c b/src/kernel/super.c index e533a29ba6522..a13edcb687e13 100644 --- a/src/kernel/super.c +++ b/src/kernel/super.c @@ -247,7 +247,8 @@ static int parse_ip(const char *c, int len, struct ceph_entity_addr *addr) goto bad; *(__be32 *)&addr->ipaddr.sin_addr.s_addr = htonl(ip); - dout(15, "parse_ip got %u.%u.%u.%u\n", ip >> 24, (ip >> 16) & 0xff, + dout(15, "parse_ip got %u.%u.%u.%u\n", + ip >> 24, (ip >> 16) & 0xff, (ip >> 8) & 0xff, ip & 0xff); return 0; diff --git a/src/kernel/super.h b/src/kernel/super.h index 9a753e50b762d..fab1eb5573f2b 100644 --- a/src/kernel/super.h +++ b/src/kernel/super.h @@ -33,6 +33,13 @@ extern int ceph_lookup_cache; #define CACHE_HZ (1*HZ) +#define IPQUADPORT(n) \ + (unsigned int)((n.sin_addr.s_addr)>>24)&0xFF, \ + (unsigned int)((n.sin_addr.s_addr)>>16)&0xFF, \ + (unsigned int)((n.sin_addr.s_addr)>>8)&0xFF, \ + (unsigned int)((n.sin_addr.s_addr)&0xFF), \ + (unsigned int)(ntohs(n.sin_port)) + /* * mount options */ -- 2.39.5