net/flow-tools/patches/020-invalid_lvalue_in_assignment.patch

   1 diff --git a/lib/ftchash.c b/lib/ftchash.c
   2 index 9cc7efa..28bafbf 100644
   3 --- a/lib/ftchash.c
   4 +++ b/lib/ftchash.c
   5 @@ -326,7 +326,7 @@ void *ftchash_foreach(struct ftchash *ft
   6        (char*)ftch->traverse_chunk->base+ftch->traverse_chunk->next) {
   7
   8        ret = ftch->traverse_rec;
   9 -      (char*)ftch->traverse_rec += ftch->d_size;
  10 +      ftch->traverse_rec = vpadd(ftch->traverse_rec, ftch->d_size);
  11        return ret;
  12
  13      } else {
  14 diff --git a/lib/ftio.c b/lib/ftio.c
  15 index f6c739c..1082416 100644
  16 --- a/lib/ftio.c
  17 +++ b/lib/ftio.c
  18 @@ -2267,7 +2267,7 @@ int readn(register int fd, register void
  19          break;
  20
  21        nleft -= nread;
  22 -      (char*)ptr += nread;
  23 +      ptr = vpadd(ptr, nread);
  24    }
  25    return (nbytes - nleft);
  26  } /* readn */
  27 @@ -2292,7 +2292,7 @@ int writen(register int fd, register voi
  28        return(nwritten); /* error */
  29
  30      nleft -= nwritten;
  31 -    (char*)ptr += nwritten;
  32 +    ptr =  vpadd(ptr,nwritten);
  33    }
  34    return(nbytes - nleft);
  35  } /* writen */
  36 diff --git a/lib/ftlib.h b/lib/ftlib.h
  37 index f91ad0a..66bf2f3 100644
  38 --- a/lib/ftlib.h
  39 +++ b/lib/ftlib.h
  40 @@ -152,7 +152,6 @@ #define FT_PDU_V8_11_MAXFLOWS 44  /* max
  41  #define FT_PDU_V8_12_MAXFLOWS 44  /* max records in V8 DST_PREFIX_TOS packet */
  42  #define FT_PDU_V8_13_MAXFLOWS 35  /* max records in V8 PREFIX_TOS packet */
  43  #define FT_PDU_V8_14_MAXFLOWS 35  /* max records in V8 PREFIX_PORT_TOS packet */
  44 -
  45  #define FT_PDU_V8_1_VERSION    2  /* version of AS packet */
  46  #define FT_PDU_V8_2_VERSION    2  /* version of PROTO PORT packet */
  47  #define FT_PDU_V8_3_VERSION    2  /* version of SRC PREFIX packet */
  48 @@ -3029,6 +3028,8 @@ #ifndef IN_CLASSD_SSM
  49  #define IN_CLASSD_SSM(i) (((u_int32_t)(i) & 0xff000000) == 0xe8000000)
  50  #endif /* IN_CLASSD_SSM */
  51
  52 +void *vpadd(const void* v, const int change);
  53 +
  54  /* MACHINE DEPENDANT */
  55  #define fmt_uint fmt_uint32
  56
  57 diff --git a/lib/fttlv.c b/lib/fttlv.c
  58 index 7035813..330a783 100644
  59 --- a/lib/fttlv.c
  60 +++ b/lib/fttlv.c
  61 @@ -68,10 +68,10 @@ int fttlv_enc_uint32(void *buf, int buf_
  62    }
  63
  64    bcopy(&t, buf, 2);
  65 -  (char*)buf+= 2;
  66 +  buf = vpadd(buf, 2);
  67
  68    bcopy(&len, buf, 2);
  69 -  (char*)buf+= 2;
  70 +  buf = vpadd(buf, 2);
  71
  72    bcopy(&v, buf, 4);
  73
  74 @@ -107,10 +107,10 @@ int fttlv_enc_uint16(void *buf, int buf_
  75    }
  76
  77    bcopy(&t, buf, 2);
  78 -  (char*)buf+= 2;
  79 +  buf = vpadd(buf, 2);
  80
  81    bcopy(&len, buf, 2);
  82 -  (char*)buf+= 2;
  83 +  buf = vpadd(buf, 2);
  84
  85    bcopy(&v, buf, 2);
  86
  87 @@ -145,10 +145,10 @@ int fttlv_enc_uint8(void *buf, int buf_s
  88    }
  89
  90    bcopy(&t, buf, 2);
  91 -  (char*)buf+= 2;
  92 +  buf = vpadd(buf, 2);
  93
  94    bcopy(&len, buf, 2);
  95 -  (char*)buf+= 2;
  96 +  buf = vpadd(buf, 2);
  97
  98    bcopy(&v, buf, 1);
  99
 100 @@ -183,10 +183,10 @@ int fttlv_enc_str(void *buf, int buf_siz
 101    }
 102
 103    bcopy(&t, buf, 2);
 104 -  (char*)buf+= 2;
 105 +  buf = vpadd(buf, 2);
 106
 107    bcopy(&len, buf, 2);
 108 -  (char*)buf+= 2;
 109 +  buf = vpadd(buf, 2);
 110
 111    bcopy(v, buf, len);
 112
 113 @@ -230,16 +230,16 @@ int fttlv_enc_ifname(void *buf, int buf_
 114      return -1;
 115
 116    bcopy(&t, buf, 2);
 117 -  (char*)buf+= 2;
 118 +  buf = vpadd(buf, 2);
 119
 120    bcopy(&len, buf, 2);
 121 -  (char*)buf+= 2;
 122 +  buf = vpadd(buf, 2);
 123
 124    bcopy(&ip, buf, 4);
 125 -  (char*)buf += 4;
 126 +  buf = vpadd(buf, 4);
 127
 128    bcopy(&ifIndex, buf, 2);
 129 -  (char*)buf += 2;
 130 +  buf = vpadd(buf, 2);
 131
 132    bcopy(name, buf, n);
 133
 134 @@ -287,19 +287,19 @@ int fttlv_enc_ifalias(void *buf, int buf
 135    }
 136
 137    bcopy(&t, buf, 2);
 138 -  (char*)buf+= 2;
 139 +  buf = vpadd(buf, 2);
 140
 141    bcopy(&len, buf, 2);
 142 -  (char*)buf+= 2;
 143 +  buf = vpadd(buf, 2);
 144
 145    bcopy(&ip, buf, 4);
 146 -  (char*)buf += 4;
 147 +  buf = vpadd(buf, 4);
 148
 149    bcopy(&entries, buf, 2);
 150 -  (char*)buf += 2;
 151 +  buf = vpadd(buf, 2);
 152
 153    bcopy(ifIndex_list, buf, esize);
 154 -  (char*)buf += esize;
 155 +  buf = vpadd(buf, esize);
 156
 157    bcopy(name, buf, n);
 158
 159 diff --git a/lib/support.c b/lib/support.c
 160 index a32ffe7..2e1db9f 100644
 161 --- a/lib/support.c
 162 +++ b/lib/support.c
 163 @@ -736,3 +736,8 @@ int udp_cksum(struct ip *ip, struct udph
 164    return sum;
 165  } /* udp_cksum */
 166
 167 +// void pointer add
 168 +
 169 +void * vpadd(const void *v, const int change) {
 170 +  return (void *) (((char*) v) + change);
 171 +}