linux-atm/linux-atm-2.5.0.diff

239 lines
7.1 KiB
Diff

Index: src/ilmid/atmf_uni.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/atmf_uni.c,v
retrieving revision 1.2.2.1
diff -u -w -r1.2.2.1 atmf_uni.c
--- src/ilmid/atmf_uni.c 19 Jul 2003 21:07:19 -0000 1.2.2.1
+++ src/ilmid/atmf_uni.c 22 Apr 2005 09:41:13 -0000
@@ -203,6 +203,7 @@
int cmp;
NetPrefixNode *prefix, *newPrefix;
AsnOid *varBindName;
+ NetPrefixNode *node;
diag(COMPONENT,DIAG_DEBUG,"setNetPrefix");
varBindName = &varbind->name;
@@ -217,7 +218,9 @@
varBindName->octs[NETPREFIX_LEN + 1] != NETPREFIX_STRINGLEN)
return NOSUCHNAME;
- for(prefix = (NetPrefixNode *) var->value, cmp = AsnOidLess;
+ node = (NetPrefixNode *) var->value;
+
+ for(prefix = node, cmp = AsnOidLess;
prefix != NULL && (cmp = AsnOidCompare(varBindName, prefix->name)) <
AsnOidEqual;
prefix = prefix->next);
@@ -228,7 +231,7 @@
newPrefix->name = alloc_t(AsnOid);
newPrefix->name->octs = alloc(varBindName->octetLen);
AsnOidCopy(newPrefix->name, varBindName);
- Q_INSERT_BEFORE((NetPrefixNode *) var->value, newPrefix, prefix);
+ Q_INSERT_BEFORE(node, newPrefix, prefix);
if(atmNetPrefix.octs == NULL)
{
atmNetPrefix.octetLen = varBindName->octetLen - NETPREFIX_LEN - 2;
@@ -238,7 +241,7 @@
}
else if (varbind->value->a.simple->a.number == INVALID && cmp == AsnOidEqual)
{
- Q_REMOVE((NetPrefixNode *) var->value, prefix);
+ Q_REMOVE(node, prefix);
}
return NOERROR;
Index: src/lane/lecs_db.l
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/lane/lecs_db.l,v
retrieving revision 1.2
diff -u -w -r1.2 lecs_db.l
--- src/lane/lecs_db.l 9 Oct 2001 22:33:07 -0000 1.2
+++ src/lane/lecs_db.l 22 Apr 2005 09:41:13 -0000
@@ -7,6 +7,7 @@
/*Standard includes*/
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
/* Local includes */
#include "lecs_load.h"
Index: src/lane/load_lex.l
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/lane/load_lex.l,v
retrieving revision 1.2
diff -u -w -r1.2 load_lex.l
--- src/lane/load_lex.l 9 Oct 2001 22:33:07 -0000 1.2
+++ src/lane/load_lex.l 22 Apr 2005 09:41:13 -0000
@@ -4,6 +4,7 @@
#include <config.h>
#endif
+#include <string.h>
#include <netinet/in.h>
#include <arpa/inet.h>
Index: src/lane/mem_lecs.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/lane/mem_lecs.c,v
retrieving revision 1.2
diff -u -w -r1.2 mem_lecs.c
--- src/lane/mem_lecs.c 9 Oct 2001 22:33:07 -0000 1.2
+++ src/lane/mem_lecs.c 22 Apr 2005 09:41:13 -0000
@@ -13,6 +13,7 @@
/* System includes */
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <sys/types.h>
/* Local includes */
Index: src/maint/atmtcp.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/maint/atmtcp.c,v
retrieving revision 1.2
diff -u -w -r1.2 atmtcp.c
--- src/maint/atmtcp.c 9 Oct 2001 22:33:07 -0000 1.2
+++ src/maint/atmtcp.c 22 Apr 2005 09:41:13 -0000
@@ -60,7 +60,7 @@
static IN *inputs = NULL;
static fd_set in_set;
static int fds = 0;
-static int debug = 0;
+/* static */ int debug = 0;
static int links = 0;
Index: src/mpoad/k_interf.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/mpoad/k_interf.c,v
retrieving revision 1.2
diff -u -w -r1.2 k_interf.c
--- src/mpoad/k_interf.c 9 Oct 2001 22:33:07 -0000 1.2
+++ src/mpoad/k_interf.c 22 Apr 2005 09:41:13 -0000
@@ -4,6 +4,7 @@
#include <stdio.h>
#include <unistd.h>
+#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <sys/param.h> /* for OPEN_MAX */
Index: src/mpoad/p_factory.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/mpoad/p_factory.c,v
retrieving revision 1.2
diff -u -w -r1.2 p_factory.c
--- src/mpoad/p_factory.c 9 Oct 2001 22:33:07 -0000 1.2
+++ src/mpoad/p_factory.c 22 Apr 2005 09:41:13 -0000
@@ -34,7 +34,9 @@
while( count > 1 ) {
/* This is the inner loop */
- sum += * ((uint16_t *) addr)++;
+ // sum += * ((uint16_t *) addr)++;
+ sum += * ((uint16_t *) addr);
+ addr += 2;
count -= 2;
}
Index: src/qgen/qlib.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/qgen/qlib.c,v
retrieving revision 1.2
diff -u -w -r1.2 qlib.c
--- src/qgen/qlib.c 9 Oct 2001 22:33:07 -0000 1.2
+++ src/qgen/qlib.c 22 Apr 2005 09:41:13 -0000
@@ -26,7 +26,7 @@
#include "op.h"
-static int debug = 0;
+/* static */ int debug = 0;
void PREFIX(report)(int severity,const char *msg,...)
Index: src/sigd/cfg_y.y
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/sigd/cfg_y.y,v
retrieving revision 1.2.2.1
diff -u -w -r1.2.2.1 cfg_y.y
--- src/sigd/cfg_y.y 20 Apr 2005 16:40:47 -0000 1.2.2.1
+++ src/sigd/cfg_y.y 22 Apr 2005 09:41:13 -0000
@@ -10,6 +10,7 @@
#include <string.h>
#include <ctype.h>
#include <limits.h>
+#include <stdlib.h>
#include "atm.h"
#include "atmd.h"
Index: src/switch/cfg_y.y
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/switch/cfg_y.y,v
retrieving revision 1.2.2.1
diff -u -w -r1.2.2.1 cfg_y.y
--- src/switch/cfg_y.y 20 Apr 2005 16:40:47 -0000 1.2.2.1
+++ src/switch/cfg_y.y 22 Apr 2005 09:41:13 -0000
@@ -10,6 +10,7 @@
#include <string.h>
#include <errno.h>
#include <limits.h>
+#include <stdlib.h>
#include "atm.h"
Index: src/switch/debug/debug.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/switch/debug/debug.c,v
retrieving revision 1.2
diff -u -w -r1.2 debug.c
--- src/switch/debug/debug.c 9 Oct 2001 22:33:08 -0000 1.2
+++ src/switch/debug/debug.c 22 Apr 2005 09:41:13 -0000
@@ -43,7 +43,8 @@
void fab_init(CALL *call)
{
- PRV(call) = alloc_t(FAB);
+ // PRV(call) = alloc_t(FAB);
+ call->fab = alloc_t(FAB);
PRV(call)->next = calls;
calls = call;
}
@@ -59,7 +60,8 @@
diag(COMPONENT,DIAG_FATAL,"fab_destroy: call %p not found",call);
*walk = PRV(call)->next;
free(PRV(call));
- PRV(call) = NULL;
+ // PRV(call) = NULL;
+ call->fab = NULL;
}
Index: src/switch/tcp/tcpsw.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/switch/tcp/tcpsw.c,v
retrieving revision 1.2
diff -u -w -r1.2 tcpsw.c
--- src/switch/tcp/tcpsw.c 9 Oct 2001 22:33:08 -0000 1.2
+++ src/switch/tcp/tcpsw.c 22 Apr 2005 09:41:13 -0000
@@ -345,7 +345,8 @@
void fab_init(CALL *call)
{
- PRV(call) = alloc_t(FAB);
+ // PRV(call) = alloc_t(FAB);
+ call->fab = alloc_t(FAB);
PRV(call)->active = 0;
PRV(call)->next = calls;
calls = call;
@@ -362,7 +363,8 @@
diag(COMPONENT,DIAG_FATAL,"fab_destroy: call %p not found",call);
*walk = PRV(call)->next;
free(PRV(call));
- PRV(call) = NULL;
+ // PRV(call) = NULL;
+ call->fab = NULL;
}