|
 |
ef56776 |
--- linux-atm/src/ilmid/atmf_uni.c~ 2005-01-18 14:35:53.000000000 +0000
|
|
|
ef56776 |
+++ linux-atm/src/ilmid/atmf_uni.c 2005-03-02 15:29:37.000000000 +0000
|
|
|
ef56776 |
@@ -228,7 +228,7 @@ AsnInt setNetPrefix(VarBind *varbind, Va
|
|
|
ef56776 |
newPrefix->name = alloc_t(AsnOid);
|
|
|
ef56776 |
newPrefix->name->octs = alloc(varBindName->octetLen);
|
|
|
ef56776 |
AsnOidCopy(newPrefix->name, varBindName);
|
|
|
ef56776 |
- Q_INSERT_BEFORE((NetPrefixNode *) var->value, newPrefix, prefix);
|
|
|
ef56776 |
+ Q_INSERT_BEFORE((*((NetPrefixNode **)&var->value)), newPrefix, prefix);
|
|
|
ef56776 |
if(atmNetPrefix.octs == NULL)
|
|
|
ef56776 |
{
|
|
|
ef56776 |
atmNetPrefix.octetLen = varBindName->octetLen - NETPREFIX_LEN - 2;
|
|
|
ef56776 |
@@ -238,7 +238,7 @@ AsnInt setNetPrefix(VarBind *varbind, Va
|
|
|
ef56776 |
}
|
|
|
ef56776 |
else if (varbind->value->a.simple->a.number == INVALID && cmp == AsnOidEqual)
|
|
|
ef56776 |
{
|
|
|
ef56776 |
- Q_REMOVE((NetPrefixNode *) var->value, prefix);
|
|
|
ef56776 |
+ Q_REMOVE((*((NetPrefixNode **) &var->value)), prefix);
|
|
|
ef56776 |
}
|
|
|
ef56776 |
|
|
|
ef56776 |
return NOERROR;
|
|
|
ef56776 |
--- linux-atm/src/maint/atmtcp.c~ 2001-10-09 23:33:07.000000000 +0100
|
|
|
ef56776 |
+++ linux-atm/src/maint/atmtcp.c 2005-03-02 14:48:12.000000000 +0000
|
|
|
ef56776 |
@@ -60,7 +60,7 @@ static OUT *outputs = NULL;
|
|
|
ef56776 |
static IN *inputs = NULL;
|
|
|
ef56776 |
static fd_set in_set;
|
|
|
ef56776 |
static int fds = 0;
|
|
|
ef56776 |
-static int debug = 0;
|
|
|
ef56776 |
+int debug = 0;
|
|
|
ef56776 |
static int links = 0;
|
|
|
ef56776 |
|
|
|
ef56776 |
|
|
|
ef56776 |
--- linux-atm/src/mpoad/p_factory.c~ 2001-10-09 23:33:07.000000000 +0100
|
|
|
ef56776 |
+++ linux-atm/src/mpoad/p_factory.c 2005-03-02 15:33:06.000000000 +0000
|
|
|
ef56776 |
@@ -31,16 +31,17 @@ unsigned short compute_ip_csum(unsigned
|
|
|
ef56776 |
* beginning at location "addr".
|
|
|
ef56776 |
*/
|
|
|
ef56776 |
uint32_t sum = 0;
|
|
|
ef56776 |
+ uint16_t *addr16 = addr;
|
|
|
ef56776 |
|
|
|
ef56776 |
while( count > 1 ) {
|
|
|
ef56776 |
/* This is the inner loop */
|
|
|
ef56776 |
- sum += * ((uint16_t *) addr)++;
|
|
|
ef56776 |
+ sum += * addr16++;
|
|
|
ef56776 |
count -= 2;
|
|
|
ef56776 |
}
|
|
|
ef56776 |
|
|
|
ef56776 |
/* Add left-over byte, if any */
|
|
|
ef56776 |
if( count > 0 )
|
|
|
ef56776 |
- sum += * (unsigned char *) addr;
|
|
|
ef56776 |
+ sum += * (unsigned char *) addr16;
|
|
|
ef56776 |
|
|
|
ef56776 |
/* Fold 32-bit sum to 16 bits */
|
|
|
ef56776 |
while (sum>>16)
|
|
|
ef56776 |
--- linux-atm/src/qgen/qlib.c~ 2001-10-09 23:33:07.000000000 +0100
|
|
|
ef56776 |
+++ linux-atm/src/qgen/qlib.c 2005-03-02 14:42:45.000000000 +0000
|
|
|
ef56776 |
@@ -26,8 +26,6 @@ int q_dump = 0;
|
|
|
ef56776 |
#include "op.h"
|
|
|
ef56776 |
|
|
|
ef56776 |
|
|
|
ef56776 |
-static int debug = 0;
|
|
|
ef56776 |
-
|
|
|
ef56776 |
|
|
|
ef56776 |
void PREFIX(report)(int severity,const char *msg,...)
|
|
|
ef56776 |
{
|
|
|
ef56776 |
@@ -830,6 +828,8 @@ int PREFIX(close)(Q_DSC *dsc)
|
|
|
ef56776 |
|
|
|
ef56776 |
#ifdef STANDALONE
|
|
|
ef56776 |
|
|
|
ef56776 |
+int debug = 0;
|
|
|
ef56776 |
+
|
|
|
ef56776 |
int main(int argc,const char **argv)
|
|
|
ef56776 |
{
|
|
|
ef56776 |
unsigned char msg[5000]; /* should be large enough for that */
|
|
|
ef56776 |
--- linux-atm/src/qgen/qlib.h~ 2001-10-09 23:33:07.000000000 +0100
|
|
|
ef56776 |
+++ linux-atm/src/qgen/qlib.h 2005-03-02 14:40:47.000000000 +0000
|
|
|
ef56776 |
@@ -23,7 +23,6 @@
|
|
|
ef56776 |
#define Q_FATAL -1
|
|
|
ef56776 |
|
|
|
ef56776 |
|
|
|
ef56776 |
-extern int q_dump;
|
|
|
ef56776 |
extern void q_report(int severity,const char *msg,...);
|
|
|
ef56776 |
|
|
|
ef56776 |
#ifdef DUMP_MODE
|
|
|
ef56776 |
--- linux-atm/src/switch/debug/debug.c~ 2001-10-09 23:33:08.000000000 +0100
|
|
|
ef56776 |
+++ linux-atm/src/switch/debug/debug.c 2005-03-02 15:34:19.000000000 +0000
|
|
|
ef56776 |
@@ -18,7 +18,7 @@
|
|
|
ef56776 |
#define COMPONENT "FAB(debug)"
|
|
|
ef56776 |
|
|
|
ef56776 |
|
|
|
ef56776 |
-#define PRV(call) ((FAB *) (call)->fab)
|
|
|
ef56776 |
+#define PRV(call) (*((FAB **) &(call)->fab))
|
|
|
ef56776 |
|
|
|
ef56776 |
|
|
|
ef56776 |
typedef struct _fab {
|
|
|
ef56776 |
--- linux-atm/src/switch/tcp/tcpsw.c~ 2001-10-09 23:33:08.000000000 +0100
|
|
|
ef56776 |
+++ linux-atm/src/switch/tcp/tcpsw.c 2005-03-02 15:34:55.000000000 +0000
|
|
|
ef56776 |
@@ -27,7 +27,7 @@
|
|
|
ef56776 |
|
|
|
ef56776 |
#define COMPONENT "FAB(tcp)"
|
|
|
ef56776 |
|
|
|
ef56776 |
-#define PRV(call) ((FAB *) (call)->fab)
|
|
|
ef56776 |
+#define PRV(call) (*((FAB **) &(call)->fab))
|
|
|
ef56776 |
|
|
|
ef56776 |
#define MAX_VCI 1024
|
|
|
ef56776 |
|