From 2633484c1f9ed6e37e7b75a72669573912c13eb5 Mon Sep 17 00:00:00 2001
From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Tue, 26 May 2009 16:56:28 +0200
Subject: [PATCH] Add more debug messages

---
 src/iop.c        | 11 ++++++++---
 src/proto_inet.c | 20 +++++++++++++++-----
 src/request.c    |  2 +-
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/iop.c b/src/iop.c
index 15835b7..4aa8131 100644
--- a/src/iop.c
+++ b/src/iop.c
@@ -209,8 +209,14 @@ forb_iop_send_reply(forb_t *forb,
 
 	peer = forb_get_next_hop(forb, dest, &timeout);
 	if (!peer) {
-		ul_logerr("Reply destination not found\n");
+		char str[60];
+		forb_server_id_to_string(str, dest, sizeof(str));
+		ul_logerr("Reply destination not found: %s\n", str);
 		goto err;
+	} else {
+		char str[60];
+		forb_server_id_to_string(str, dest, sizeof(str));
+		ul_logdeb("sending reply: dest=%s, id=%u\n", str, request_id);
 	}
 	forb_proto_send(peer, codec);
 	forb_peer_put(peer);
@@ -267,6 +273,7 @@ process_request(forb_port_t *port, FORB_CDR_Codec *codec, uint32_t message_size)
 			forb_peer_put(port->new_peer);
 			port->new_peer = NULL;
 		} else {
+			ul_logdeb("discovered new_peer from incomming connection\n");
 			peer = port->new_peer;
 			port->new_peer = NULL;
 			forb_new_peer_discovered(port, peer, request_header.source,
@@ -603,5 +610,3 @@ void *forb_iop_discovery_thread(void *arg)
 	pthread_cleanup_pop(1);
 	return NULL;
 }
-
-
diff --git a/src/proto_inet.c b/src/proto_inet.c
index c2ebc26..538cb71 100644
--- a/src/proto_inet.c
+++ b/src/proto_inet.c
@@ -151,21 +151,27 @@ inet_connect(forb_peer_t *peer)
 	struct inet_addr *addr = peer->addr;
 	int ret;
 
-	if (!addr)
+	if (!addr) {
+		ul_logerr("No address to connect\n");
 		return NULL;
+	}
 	ipeer = forb_malloc(sizeof(*ipeer));
 	if (!ipeer)
 		goto err;
 	ipeer->socket = socket(PF_INET, SOCK_STREAM, 0);
-	if (!ipeer->socket)
+	if (!ipeer->socket) {
+		ul_logerr("socket(): %s\n", strerror(errno));
 		goto err_free;
+	}
 	sa.sin_family = AF_INET;
 	sa.sin_port = addr->port;
 	sa.sin_addr = addr->addr;
 	ul_logdeb("connect to %s:%u\n", inet_ntoa(sa.sin_addr), ntohs(sa.sin_port));
 	ret = connect(ipeer->socket, (struct sockaddr*)&sa, sizeof(sa));
-	if (ret)
+	if (ret) {
+		ul_logerr("connect error: %s\n", strerror(errno));
 		goto err_close;
+	}
 
 	return ipeer;
 err_close:
@@ -185,17 +191,21 @@ inet_send(forb_peer_t *peer, const void *buf, size_t len)
 
 	if (!ipeer) {
 		ipeer = inet_connect(peer);
-		if (!ipeer)
+		if (!ipeer) {
 			return -1;
+		}
 		peer->proto_priv = ipeer;
 		
 	}
 
 	sent = 0;
+	ul_logdeb("send fd=%d\n", ipeer->socket);
 	do {
 		ret = send(ipeer->socket, buf, len, 0);
-		if (ret < 0)
+		if (ret < 0) {
+			ul_logerr("send error: %s\n", strerror(errno));
 			return ret;
+		}
 		sent += ret;
 		buf += ret;
 		len -= ret;
diff --git a/src/request.c b/src/request.c
index 46ad81d..08a8c2e 100644
--- a/src/request.c
+++ b/src/request.c
@@ -202,7 +202,7 @@ forb_request_send(forb_request_t *req, CORBA_Environment *env)
 	peer = forb_get_next_hop(forb, &req->obj->server, &timeout);
 	if (!peer) {
 		char str[50];
-		ul_logmsg("Cannot find peer to send request for server %s\n",
+		ul_logerr("Cannot find peer to send request for server %s\n",
 			  forb_server_id_to_string(str, &req->obj->server, sizeof(str)));
 		env->major = FORB_EX_COMM_FAILURE;
 		return;
-- 
2.39.2