diff --git a/platform/netsim/display.c b/platform/netsim/display.c index d3f7efa5d..b8667f669 100644 --- a/platform/netsim/display.c +++ b/platform/netsim/display.c @@ -24,7 +24,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * - * $Id: display.c,v 1.1 2006/06/17 22:41:35 adamdunkels Exp $ + * $Id: display.c,v 1.2 2006/09/26 22:10:12 adamdunkels Exp $ * * Author: Adam Dunkels * @@ -45,7 +45,7 @@ static GdkPixmap *pixmap = NULL; static GtkWidget *drawing_area; - +static GdkFont *font; #define DISPLAY_WIDTH 400 #define DISPLAY_HEIGHT 300 @@ -111,7 +111,7 @@ display_redraw(void) x = n->x; y = n->y; - if(n->type == NODE_TYPE_CLUSTERHEAD) { + /* if(n->type == NODE_TYPE_CLUSTERHEAD) { gdk_draw_arc(pixmap, intensity_clusterhead_lightgray, TRUE, @@ -119,7 +119,7 @@ display_redraw(void) y * SCALE - DOT_SIZE * SCALE, DOT_SIZE * 2 * SCALE, DOT_SIZE * 2 * SCALE, 0, 360 * 64); - } + }*/ if(n == marked_node) { gdk_draw_arc(pixmap, @@ -138,7 +138,7 @@ display_redraw(void) x = n->x; y = n->y; - if(n->type == NODE_TYPE_CLUSTERHEAD) { + /* if(n->type == NODE_TYPE_CLUSTERHEAD) { gdk_draw_rectangle(pixmap, intensity_clusterhead_red, TRUE, @@ -159,9 +159,18 @@ display_redraw(void) } + } + } else */ { + + if(strlen(n->text) > 0) { + gdk_draw_string(pixmap, + font, + black, + x * SCALE + 2, + y * SCALE - 1, + n->text); + } - } else { - gdk_draw_rectangle(pixmap, black, TRUE, @@ -497,6 +506,8 @@ display_init(void (* idlefunc)(void), int time, int with_gui) gtk_signal_connect(GTK_OBJECT (window), "destroy", GTK_SIGNAL_FUNC (quit), NULL); + + font = gdk_font_load("-*-courier-medium-r-*-*-12-*-*-*-*-*-iso8859-1"); /* Create the drawing area */ diff --git a/platform/netsim/ether.c b/platform/netsim/ether.c index 94d66837a..84b8eecff 100644 --- a/platform/netsim/ether.c +++ b/platform/netsim/ether.c @@ -30,7 +30,7 @@ * * Author: Adam Dunkels * - * $Id: ether.c,v 1.1 2006/06/17 22:41:35 adamdunkels Exp $ + * $Id: ether.c,v 1.2 2006/09/26 22:10:12 adamdunkels Exp $ */ /** * \file @@ -85,6 +85,7 @@ static int s, sc; #define PTYPE_DATA 2 #define PTYPE_SENSOR 3 #define PTYPE_LEDS 4 +#define PTYPE_TEXT 5 struct ether_hdr { int type; @@ -95,7 +96,9 @@ struct ether_hdr { int srcid; int srcnodetype; int leds; + char text[NODES_TEXTLEN]; }; + static int strength; static int collisions = 1; @@ -207,7 +210,7 @@ ether_client_poll(void) memcpy(uip_buf, &rxbuffer[sizeof(struct ether_hdr)], len); - if(hdr->type == PTYPE_DATA) { + if(hdr->type == PTYPE_DATA && hdr->srcid != node.id) { return len - sizeof(struct ether_hdr); } else if(hdr->type == PTYPE_CLOCK) { node_set_time(hdr->clock); @@ -262,6 +265,9 @@ ether_server_poll(void) case PTYPE_LEDS: nodes_set_leds(hdr->srcx, hdr->srcy, hdr->leds); break; + case PTYPE_TEXT: + nodes_set_text(hdr->srcx, hdr->srcy, hdr->text); + break; } } /* tv.tv_sec = 0; @@ -334,7 +340,7 @@ ether_tick(void) /* Update the node type. */ hdr = (struct ether_hdr *)p->data; - nodes_node(hdr->srcid)->type = hdr->srcnodetype; + /* nodes_node(hdr->srcid)->type = hdr->srcnodetype;*/ if(!(p->x == x && p->y == y) && /* Don't send packets back to the sender. */ @@ -363,6 +369,8 @@ ether_tick(void) } if(!interference) { + /* printf("ether: delivering packet from %d to %d\n", + hdr->srcid, port);*/ send_packet(p->data, p->len, port); } } @@ -419,7 +427,7 @@ ether_send(char *data, int len) hdr->srcx = node.x; hdr->srcy = node.y; hdr->type = PTYPE_DATA; - hdr->srcnodetype = node.type; + /* hdr->srcnodetype = node.type;*/ hdr->srcid = node.id; @@ -437,7 +445,23 @@ ether_set_leds(int leds) hdr.srcy = node.y; hdr.type = PTYPE_LEDS; hdr.leds = leds; - hdr.srcnodetype = node.type; + /* hdr.srcnodetype = node.type;*/ + hdr.srcid = node.id; + + node_send_packet((char *)&hdr, sizeof(struct ether_hdr)); + +} +/*-----------------------------------------------------------------------------------*/ +void +ether_set_text(char *text) +{ + struct ether_hdr hdr; + + hdr.srcx = node.x; + hdr.srcy = node.y; + hdr.type = PTYPE_TEXT; + strncpy(hdr.text, text, NODES_TEXTLEN); + /* hdr.srcnodetype = node.type;*/ hdr.srcid = node.id; node_send_packet((char *)&hdr, sizeof(struct ether_hdr)); diff --git a/platform/netsim/ether.h b/platform/netsim/ether.h index c93e92e47..1a48f6838 100644 --- a/platform/netsim/ether.h +++ b/platform/netsim/ether.h @@ -1,36 +1,36 @@ /* * Copyright (c) 2004, Swedish Institute of Computer Science. - * All rights reserved. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * * This file is part of the Contiki operating system. - * + * * Author: Adam Dunkels * - * $Id: ether.h,v 1.1 2006/06/17 22:41:35 adamdunkels Exp $ + * $Id: ether.h,v 1.2 2006/09/26 22:10:12 adamdunkels Exp $ */ #ifndef __ETHER_H__ #define __ETHER_H__ @@ -39,15 +39,16 @@ #include "sensor.h" struct ether_packet { - struct ether_packet *next; + struct ether_packet *next; char data[1500]; int len; - int x, y; + int x, y; }; u8_t ether_send(char *data, int len); void ether_set_leds(int leds); +void ether_set_text(char *text); void ether_poll(void); diff --git a/platform/netsim/node.c b/platform/netsim/node.c index e365bbe10..1f38f9812 100644 --- a/platform/netsim/node.c +++ b/platform/netsim/node.c @@ -30,7 +30,7 @@ * * Author: Adam Dunkels * - * $Id: node.c,v 1.2 2006/08/14 14:01:02 bg- Exp $ + * $Id: node.c,v 1.3 2006/09/26 22:10:12 adamdunkels Exp $ */ #include "node.h" #include "contiki.h" @@ -55,7 +55,7 @@ node_init(int id, int posx, int posy, int b) node.id = id; node.x = posx; node.y = posy; - node.type = NODE_TYPE_NORMAL; + /* node.type = NODE_TYPE_NORMAL;*/ if(b) { uip_ipaddr(&addr, 192,168,250,2); diff --git a/platform/netsim/node.h b/platform/netsim/node.h index 1f58f5f85..fbe8de2d1 100644 --- a/platform/netsim/node.h +++ b/platform/netsim/node.h @@ -1,36 +1,36 @@ /* * Copyright (c) 2004, Swedish Institute of Computer Science. - * All rights reserved. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * * This file is part of the Contiki operating system. - * + * * Author: Adam Dunkels * - * $Id: node.h,v 1.1 2006/06/17 22:41:35 adamdunkels Exp $ + * $Id: node.h,v 1.2 2006/09/26 22:10:12 adamdunkels Exp $ */ #ifndef __NODE_H__ #define __NODE_H__ @@ -39,12 +39,6 @@ struct node { int x, y; - -#define NODE_TYPE_NORMAL 1 -#define NODE_TYPE_CLUSTERHEAD 2 - int type; - - /* The node ID is used only during simulation. */ int id; }; diff --git a/platform/netsim/nodes.c b/platform/netsim/nodes.c index 8fe40f0d8..a874389d4 100644 --- a/platform/netsim/nodes.c +++ b/platform/netsim/nodes.c @@ -1,36 +1,36 @@ /* * Copyright (c) 2004, Swedish Institute of Computer Science. - * All rights reserved. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * * This file is part of the Contiki operating system. - * + * * Author: Adam Dunkels * - * $Id: nodes.c,v 1.1 2006/06/17 22:41:35 adamdunkels Exp $ + * $Id: nodes.c,v 1.2 2006/09/26 22:10:12 adamdunkels Exp $ */ #include #include @@ -99,6 +99,19 @@ nodes_set_leds(int x, int y, int leds) } } /*---------------------------------------------------------------------------*/ +void +nodes_set_text(int x, int y, char *text) +{ + int i; + + for(i = numnodes; i >= 0; --i) { + if(nodes[i].x == x && nodes[i].y == y) { + strncpy(nodes[i].text, text, NODES_TEXTLEN); + return; + } + } +} +/*---------------------------------------------------------------------------*/ struct nodes_node * nodes_find_pid(pid_t pid) { diff --git a/platform/netsim/nodes.h b/platform/netsim/nodes.h index 227df5d20..a0b434023 100644 --- a/platform/netsim/nodes.h +++ b/platform/netsim/nodes.h @@ -1,47 +1,49 @@ /* * Copyright (c) 2004, Swedish Institute of Computer Science. - * All rights reserved. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * * This file is part of the Contiki operating system. - * + * * Author: Adam Dunkels * - * $Id: nodes.h,v 1.1 2006/06/17 22:41:35 adamdunkels Exp $ + * $Id: nodes.h,v 1.2 2006/09/26 22:10:12 adamdunkels Exp $ */ #ifndef __NODES_H__ #define __NODES_H__ #include +#define NODES_TEXTLEN 4 void nodes_init(void); void nodes_add(int pid, int x, int y, int port); void nodes_kill(void); void nodes_set_leds(int x, int y, int leds); +void nodes_set_text(int x, int y, char *text); int nodes_num(void); struct nodes_node *nodes_node(int num); @@ -51,8 +53,8 @@ struct nodes_node { int pid; int x, y; int port; - int type; int leds; + char text[NODES_TEXTLEN]; }; #define NODES_PORTBASE 5000