diff options
Diffstat (limited to 'gg_map/gg_map.c')
| -rw-r--r-- | gg_map/gg_map.c | 57 |
1 files changed, 32 insertions, 25 deletions
diff --git a/gg_map/gg_map.c b/gg_map/gg_map.c index 9809977..48c68f0 100644 --- a/gg_map/gg_map.c +++ b/gg_map/gg_map.c @@ -6,7 +6,7 @@ #include <libglouglou.h> #include <libggnet.h> -int _debug = 0; +int _loglevel = 0; Evas_Object *_mainwin; Evas_Object *_egraph = NULL; @@ -130,7 +130,7 @@ _conn_add(u_int id, u_int src, u_int dst, u_int proto, u_int8_t pktsize) int size, response; GG_PKTDATA_SIZE_DECODE(pktsize, size, response); - if (_debug) + if (_loglevel >= 2) printf("_conn_add\n"); if (response > 0) /* cannot have a new connection that is a response */ return; @@ -144,7 +144,7 @@ _conn_add(u_int id, u_int src, u_int dst, u_int proto, u_int8_t pktsize) va = _node_to_vertice(a); vb = _node_to_vertice(b); e = egraph_edge_find(_egraph, va, vb); - if (_debug) + if (_loglevel >= 2) printf("_conn_add: a %d b %d e %x id %d\n", va->id, vb->id, e, id); if (!e) { if (a->group && a->group->conn_count == 1) @@ -152,7 +152,7 @@ _conn_add(u_int id, u_int src, u_int dst, u_int proto, u_int8_t pktsize) if (b->group && b->group->conn_count == 1) _node_detach_parentgroup(b); e = egraph_edge_add(_egraph, va, vb, conn); - if (_debug) + if (_loglevel >= 2) printf("_conn_add: egraph edge added %x\n", e); } ggnet_conn_usrdata_set(conn, e); @@ -169,7 +169,7 @@ _conn_del(int id) { a = ggnet_conn_src_get(conn); b = ggnet_conn_dst_get(conn); e = ggnet_conn_usrdata_get(conn); - if (_debug) + if (_loglevel >= 2) printf("_conn_del: conn id %d\n", id); // XXX ggnet_conn_del(_ggnet, conn); /* is there other connections between these peers ? */ @@ -177,7 +177,7 @@ _conn_del(int id) { if (!otherconn) { // XXX lets keep the edges, igraph layouting behaves badly when you have // a vertice without edge ... - if (_debug) + if (_loglevel >= 2) printf("_conn_del: edge del %x\n", e); // XXX egraph_edge_del(_egraph, e); if (a->group && a->group->conn_count == 0) @@ -185,11 +185,11 @@ _conn_del(int id) { if (b->group && b->group->conn_count == 0) _node_attach_parentgroup(b); } else { - if (_debug) + if (_loglevel >= 2) printf("_conn_del: not last one, edge %x *not* deleted\n", e); } } else { - if (_debug) + if (_loglevel >= 2) printf("_conn_del: does not exist !\n"); } } @@ -235,12 +235,14 @@ _cb_packet(struct gg_client *cli, struct gg_packet *pkt) { switch(pkt->type) { case PACKET_NEWCONN: - printf(" type PACKET_NEWCONN\n"); - printf(" newconn_id %d\n", pkt->newconn_id); - printf(" newconn_src %4x\n", pkt->newconn_src); - printf(" newconn_dst %4x\n", pkt->newconn_dst); - printf(" newconn_proto %d\n", pkt->newconn_proto); - printf(" newconn_size %d\n", pkt->newconn_size); + if (_loglevel >= 1) { + printf(" type PACKET_NEWCONN\n"); + printf(" newconn_id %d\n", pkt->newconn_id); + printf(" newconn_src %4x\n", pkt->newconn_src); + printf(" newconn_dst %4x\n", pkt->newconn_dst); + printf(" newconn_proto %d\n", pkt->newconn_proto); + printf(" newconn_size %d\n", pkt->newconn_size); + } _conn_del(pkt->newconn_id); /* in case we missed a previous del */ _conn_add(pkt->newconn_id, pkt->newconn_src, pkt->newconn_dst, @@ -248,25 +250,31 @@ _cb_packet(struct gg_client *cli, struct gg_packet *pkt) break; case PACKET_DELCONN: - printf(" type PACKET_DELCONN\n"); - printf(" delconn_id %d\n", pkt->delconn_id); + if (_loglevel >= 1) { + printf(" type PACKET_DELCONN\n"); + printf(" delconn_id %d\n", pkt->delconn_id); + } _conn_del(pkt->delconn_id); break; case PACKET_DATA: - //printf(" type PACKET_DATA\n"); - //printf(" data_connid %d\n", pkt->data_connid); - //printf(" data_size %d\n", pkt->data_size); + if (_loglevel >= 1) { + //printf(" type PACKET_DATA\n"); + //printf(" data_connid %d\n", pkt->data_connid); + //printf(" data_size %d\n", pkt->data_size); + } _conn_data(pkt->data_connid, pkt->data_size); break; case PACKET_NAME: - printf(" type PACKET_NAME\n"); - printf(" name_addr %4x\n", pkt->name_addr); - printf(" name_len %d\n", pkt->name_len); - printf(" name_name_fqdn %s\n", pkt->name_fqdn); + if (_loglevel >= 1) { + printf(" type PACKET_NAME\n"); + printf(" name_addr %4x\n", pkt->name_addr); + printf(" name_len %d\n", pkt->name_len); + printf(" name_name_fqdn %s\n", pkt->name_fqdn); + } _conn_name(pkt->name_addr, pkt->name_len, pkt->name_fqdn); break; @@ -349,7 +357,6 @@ elm_main(int argc, char **argv) char gg_serv_ip[30] = "127.0.0.1"; int gg_serv_port = GLOUGLOU_ANALY_DEFAULT_PORT; int retval = -1; - int loglevel = 0; int op; while ((op = getopt(argc, argv, "hv")) != -1) { @@ -358,7 +365,7 @@ elm_main(int argc, char **argv) usage(); /* NOTREACHED */ case 'v': - loglevel++; + _loglevel++; break; default: usage(); |