Overview
Comment: | Rename OF_BSWAP_* to of_bswap_* as they are not really macros. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
8384ca42738c10a1d4ef598c0dd03fb1 |
User & Date: | js on 2011-02-01 20:53:24 |
Other Links: | manifest | tags |
Context
2011-02-01
| ||
20:58 | Use OFInvalidFormatException for -[(hexa)decimalValue] on bad strings. check-in: 58a082efe4 user: js tags: trunk | |
20:53 | Rename OF_BSWAP_* to of_bswap_* as they are not really macros. check-in: 8384ca4273 user: js tags: trunk | |
15:55 | Add missing files to .xcodeproj and adjust tests. check-in: eb260acec9 user: js tags: trunk | |
Changes
Modified src/OFMD5Hash.m from [25bc5c5f44] to [62560185fb].
︙ | ︙ | |||
163 164 165 166 167 168 169 | if (size < t) { memcpy(p, buffer, size); return; } memcpy(p, buffer, t); | | | | 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 | if (size < t) { memcpy(p, buffer, size); return; } memcpy(p, buffer, t); of_bswap32_vec_if_be((uint32_t*)in, 16); md5_transform(buf, (uint32_t*)in); buffer += t; size -= t; } /* Process data in 64-byte chunks */ while (size >= 64) { memcpy(in, buffer, 64); of_bswap32_vec_if_be((uint32_t*)in, 16); md5_transform(buf, (uint32_t*)in); buffer += 64; size -= 64; } /* Handle any remaining bytes of data. */ |
︙ | ︙ | |||
209 210 211 212 213 214 215 | /* Bytes of padding needed to make 64 bytes */ count = 64 - 1 - count; /* Pad out to 56 mod 64 */ if (count < 8) { /* Two lots of padding: Pad the first block to 64 bytes */ memset(p, 0, count); | | | | | 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 | /* Bytes of padding needed to make 64 bytes */ count = 64 - 1 - count; /* Pad out to 56 mod 64 */ if (count < 8) { /* Two lots of padding: Pad the first block to 64 bytes */ memset(p, 0, count); of_bswap32_vec_if_be((uint32_t*)in, 16); md5_transform(buf, (uint32_t*)in); /* Now fill the next block with 56 bytes */ memset(in, 0, 56); } else { /* Pad block to 56 bytes */ memset(p, 0, count - 8); } of_bswap32_vec_if_be((uint32_t*)in, 14); /* Append length in bits and transform */ ((uint32_t*)in)[14] = bits[0]; ((uint32_t*)in)[15] = bits[1]; md5_transform(buf, (uint32_t*)in); of_bswap32_vec_if_be(buf, 4); isCalculated = YES; return (uint8_t*)buf; } @end |
Modified src/OFStream.m from [91d5f2f808] to [77f3cb0a9b].
︙ | ︙ | |||
145 146 147 148 149 150 151 | - (uint16_t)readBigEndianInt16 { uint16_t ret; [self readExactlyNBytes: 2 intoBuffer: (char*)&ret]; | | | | | | | | 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 | - (uint16_t)readBigEndianInt16 { uint16_t ret; [self readExactlyNBytes: 2 intoBuffer: (char*)&ret]; return of_bswap16_if_le(ret); } - (uint32_t)readBigEndianInt32 { uint32_t ret; [self readExactlyNBytes: 4 intoBuffer: (char*)&ret]; return of_bswap32_if_le(ret); } - (uint64_t)readBigEndianInt64 { uint64_t ret; [self readExactlyNBytes: 8 intoBuffer: (char*)&ret]; return of_bswap64_if_le(ret); } - (uint16_t)readLittleEndianInt16 { uint16_t ret; [self readExactlyNBytes: 2 intoBuffer: (char*)&ret]; return of_bswap16_if_be(ret); } - (uint32_t)readLittleEndianInt32 { uint32_t ret; [self readExactlyNBytes: 4 intoBuffer: (char*)&ret]; return of_bswap32_if_be(ret); } - (uint64_t)readLittleEndianInt64 { uint64_t ret; [self readExactlyNBytes: 8 intoBuffer: (char*)&ret]; return of_bswap64_if_be(ret); } - (OFDataArray*)readDataArrayWithItemSize: (size_t)itemsize andNItems: (size_t)nitems { OFDataArray *da; char *tmp; |
︙ | ︙ | |||
580 581 582 583 584 585 586 | { [self writeNBytes: 1 fromBuffer: (char*)&int8]; } - (void)writeBigEndianInt16: (uint16_t)int16 { | | | | | | | | 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 | { [self writeNBytes: 1 fromBuffer: (char*)&int8]; } - (void)writeBigEndianInt16: (uint16_t)int16 { int16 = of_bswap16_if_le(int16); [self writeNBytes: 2 fromBuffer: (char*)&int16]; } - (void)writeBigEndianInt32: (uint32_t)int32 { int32 = of_bswap32_if_le(int32); [self writeNBytes: 4 fromBuffer: (char*)&int32]; } - (void)writeBigEndianInt64: (uint64_t)int64 { int64 = of_bswap64_if_le(int64); [self writeNBytes: 8 fromBuffer: (char*)&int64]; } - (void)writeLittleEndianInt16: (uint16_t)int16 { int16 = of_bswap16_if_be(int16); [self writeNBytes: 2 fromBuffer: (char*)&int16]; } - (void)writeLittleEndianInt32: (uint32_t)int32 { int32 = of_bswap32_if_be(int32); [self writeNBytes: 4 fromBuffer: (char*)&int32]; } - (void)writeLittleEndianInt64: (uint64_t)int64 { int64 = of_bswap64_if_be(int64); [self writeNBytes: 8 fromBuffer: (char*)&int64]; } - (size_t)writeDataArray: (OFDataArray*)dataarray { |
︙ | ︙ |
Modified src/OFTCPSocket.m from [8771225ab8] to [7b6a248246].
︙ | ︙ | |||
124 125 126 127 128 129 130 | newWithClass: isa node: node service: service]; } if ((se = getservbyname([service cString], "TCP")) != NULL) port = se->s_port; | | | 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 | newWithClass: isa node: node service: service]; } if ((se = getservbyname([service cString], "TCP")) != NULL) port = se->s_port; else if ((port = of_bswap16_if_le(strtol([service cString], NULL, 10))) == 0) { # ifdef OF_THREADS [addrlist release]; [mutex unlock]; # endif @throw [OFAddressTranslationFailedException newWithClass: isa |
︙ | ︙ | |||
251 252 253 254 255 256 257 | newWithClass: isa node: node service: service]; } if ((se = getservbyname([service cString], "TCP")) != NULL) port = se->s_port; | | | 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 | newWithClass: isa node: node service: service]; } if ((se = getservbyname([service cString], "TCP")) != NULL) port = se->s_port; else if ((port = of_bswap16_if_le(strtol([service cString], NULL, 10))) == 0) { # ifdef OF_THREADS [mutex unlock]; # endif @throw [OFAddressTranslationFailedException newWithClass: isa node: node |
︙ | ︙ |
Modified src/macros.h from [67131af672] to [faed5c9c98].
︙ | ︙ | |||
61 62 63 64 65 66 67 | #ifndef _WIN32 # define OF_PATH_DELIM '/' #else # define OF_PATH_DELIM '\\' #endif static OF_INLINE uint16_t OF_CONST_FUNC | | | | | | 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 | #ifndef _WIN32 # define OF_PATH_DELIM '/' #else # define OF_PATH_DELIM '\\' #endif static OF_INLINE uint16_t OF_CONST_FUNC of_bswap16_const(uint16_t i) { return (i & UINT16_C(0xFF00)) >> 8 | (i & UINT16_C(0x00FF)) << 8; } static OF_INLINE uint32_t OF_CONST_FUNC of_bswap32_const(uint32_t i) { return (i & UINT32_C(0xFF000000)) >> 24 | (i & UINT32_C(0x00FF0000)) >> 8 | (i & UINT32_C(0x0000FF00)) << 8 | (i & UINT32_C(0x000000FF)) << 24; } static OF_INLINE uint64_t OF_CONST_FUNC of_bswap64_const(uint64_t i) { return (i & UINT64_C(0xFF00000000000000)) >> 56 | (i & UINT64_C(0x00FF000000000000)) >> 40 | (i & UINT64_C(0x0000FF0000000000)) >> 24 | (i & UINT64_C(0x000000FF00000000)) >> 8 | (i & UINT64_C(0x00000000FF000000)) << 8 | (i & UINT64_C(0x0000000000FF0000)) << 24 | (i & UINT64_C(0x000000000000FF00)) << 40 | (i & UINT64_C(0x00000000000000FF)) << 56; } static OF_INLINE uint16_t OF_CONST_FUNC of_bswap16_nonconst(uint16_t i) { #if defined(OF_X86_ASM) || defined(OF_AMD64_ASM) __asm__ ( "xchgb %h0, %b0" : "=Q"(i) : "0"(i) ); |
︙ | ︙ | |||
118 119 120 121 122 123 124 | i = (i & UINT16_C(0xFF00)) >> 8 | (i & UINT16_C(0x00FF)) << 8; #endif return i; } static OF_INLINE uint32_t OF_CONST_FUNC | | | 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 | i = (i & UINT16_C(0xFF00)) >> 8 | (i & UINT16_C(0x00FF)) << 8; #endif return i; } static OF_INLINE uint32_t OF_CONST_FUNC of_bswap32_nonconst(uint32_t i) { #if defined(OF_X86_ASM) || defined(OF_AMD64_ASM) __asm__ ( "bswap %0" : "=q"(i) : "0"(i) ); |
︙ | ︙ | |||
148 149 150 151 152 153 154 | (i & UINT32_C(0x0000FF00)) << 8 | (i & UINT32_C(0x000000FF)) << 24; #endif return i; } static OF_INLINE uint64_t OF_CONST_FUNC | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 | (i & UINT32_C(0x0000FF00)) << 8 | (i & UINT32_C(0x000000FF)) << 24; #endif return i; } static OF_INLINE uint64_t OF_CONST_FUNC of_bswap64_nonconst(uint64_t i) { #if defined(OF_AMD64_ASM) __asm__ ( "bswap %0" : "=r"(i) : "0"(i) ); #elif defined(OF_X86_ASM) __asm__ ( "bswap %%eax\n\t" "bswap %%edx\n\t" "xchgl %%eax, %%edx" : "=A"(i) : "0"(i) ); #else i = (uint64_t)of_bswap32_nonconst(i & 0xFFFFFFFF) << 32 | of_bswap32_nonconst(i >> 32); #endif return i; } #ifdef __GNUC__ # define of_bswap16(i) \ (__builtin_constant_p(i) ? of_bswap16_const(i) : of_bswap16_nonconst(i)) # define of_bswap32(i) \ (__builtin_constant_p(i) ? of_bswap32_const(i) : of_bswap32_nonconst(i)) # define of_bswap64(i) \ (__builtin_constant_p(i) ? of_bswap64_const(i) : of_bswap64_nonconst(i)) #else # define of_bswap16(i) of_bswap16_const(i) # define of_bswap32(i) of_bswap32_const(i) # define of_bswap64(i) of_bswap64_const(i) #endif static OF_INLINE void of_bswap32_vec(uint32_t *buf, size_t len) { while (len--) { *buf = of_bswap32(*buf); buf++; } } #ifdef OF_BIG_ENDIAN # define of_bswap16_if_be(i) of_bswap16(i) # define of_bswap32_if_be(i) of_bswap32(i) # define of_bswap64_if_be(i) of_bswap64(i) # define of_bswap16_if_le(i) (i) # define of_bswap32_if_le(i) (i) # define of_bswap64_if_le(i) (i) # define of_bswap32_vec_if_be(buf, len) of_bswap32_Vec(buf, len) #else # define of_bswap16_if_be(i) (i) # define of_bswap32_if_be(i) (i) # define of_bswap64_if_be(i) (i) # define of_bswap16_if_le(i) of_bswap16(i) # define of_bswap32_if_le(i) of_bswap32(i) # define of_bswap64_if_le(i) of_bswap64(i) # define of_bswap32_vec_if_be(buf, len) #endif #define OF_ROL(val, bits) \ (((val) << ((bits) % (sizeof(val) * 8))) | \ (val) >> (sizeof(val) * 8 - ((bits) % (sizeof(val) * 8)))) #define OF_HASH_INIT(hash) hash = 0 |
︙ | ︙ |