ec_inet.h (ettercap-0.8.3) | : | ec_inet.h (ettercap-0.8.3.1) | ||
---|---|---|---|---|
skipping to change at line 154 | skipping to change at line 154 | |||
#define pntol(x) ( (u_int32)*((u_int8 *)x+3)<<0| \ | #define pntol(x) ( (u_int32)*((u_int8 *)x+3)<<0| \ | |||
(u_int32)*((u_int8 *)x+2)<<8| \ | (u_int32)*((u_int8 *)x+2)<<8| \ | |||
(u_int32)*((u_int8 *)x+1)<<16| \ | (u_int32)*((u_int8 *)x+1)<<16| \ | |||
(u_int32)*((u_int8 *)x+0)<<24 \ | (u_int32)*((u_int8 *)x+0)<<24 \ | |||
) | ) | |||
/* return little endian */ | /* return little endian */ | |||
#define htons_inv(x) (u_int16)(x << 8) | (x >> 8) | #define htons_inv(x) (u_int16)(x << 8) | (x >> 8) | |||
#define ORDER_ADD_SHORT(a, b) a = a + b | #define ORDER_ADD_SHORT(a, b) a = a + b | |||
#define ORDER_ADD_LONG(a, b) a = a + b | #define ORDER_ADD_LONG(a, b) a = a + b | |||
#else | #else | |||
/* LITTLE ENDIAN */ | /* LITTLE ENDIAN */ | |||
#define phtos(x) *(u_int16 *)(x) | #define phtos(x) *(u_int16 *)(x) | |||
#define phtol(x) *(u_int32 *)(x) | #define phtol(x) *(u_int32 *)(x) | |||
#define pntos(x) ntohs(*(u_int16 *)(x)) | #define pntos(x) ntohs(*(u_int16 *)(x)) | |||
#define pntol(x) ntohl(*(u_int32 *)(x)) | #define pntol(x) ntohl(*(u_int32 *)(x)) | |||
/* return little endian */ | /* return little endian */ | |||
#define htons_inv(x) (u_int16)x | #define htons_inv(x) (u_int16)x | |||
#define ORDER_ADD_SHORT(a, b) a = htons(ntohs(a) + (int16)b) | #define ORDER_ADD_SHORT(a, b) a = htons(ntohs(a) + (int16_t)b) | |||
#define ORDER_ADD_LONG(a, b) a = htonl(ntohl(a) + (int32)b) | #define ORDER_ADD_LONG(a, b) a = htonl(ntohl(a) + (int32_t)b) | |||
#endif | #endif | |||
#define int_ntoa(x) inet_ntoa(*((struct in_addr *)&(x))) | #define int_ntoa(x) inet_ntoa(*((struct in_addr *)&(x))) | |||
#endif | #endif | |||
/* EOF */ | /* EOF */ | |||
// vim:ts=3:expandtab | // vim:ts=3:expandtab | |||
End of changes. 2 change blocks. | ||||
3 lines changed or deleted | 3 lines changed or added |