chris/Cog
2
1
Fork 0
Code Issues 65 Pull requests Projects Releases Packages Wiki Activity Actions

Fix for boundary conditions. Corner cases are your friend.

Browse source
This commit is contained in:
vspader 2007-03-04 00:50:19 +00:00
parent 4b3f31b51a
commit ebaf536339
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Plugins/HTTPSource/HTTPSource.m
View file

@ -59,12 +59,16 @@
if (!pastHeader) { if (!pastHeader) {
const int delimeter_size = 4; //\r\n\r\n const int delimeter_size = 4; //\r\n\r\n
FILE *testFout = fopen("header.raw", "w");
int l = [_socket receive:buffer amount:amount]; int l = [_socket receive:buffer amount:amount];
uint8_t *f; uint8_t *f;
while(NULL == (f = (uint8_t *)strnstr((const char *)buffer, "\r\n\r\n", l))) { while(NULL == (f = (uint8_t *)strnstr((const char *)buffer, "\r\n\r\n", l))) {
NSLog(@"LOOKING FOR HEADER! %i", f);
fwrite(buffer, 1,l, testFout);
//Need to check for boundary conditions //Need to check for boundary conditions
memmove(buffer, (uint8_t *)buffer + (l - delimeter_size), delimeter_size); memmove(buffer, (uint8_t *)buffer + (l - delimeter_size), delimeter_size);
l = [_socket receive:((uint8_t *)buffer + delimeter_size) amount:(amount - delimeter_size)]; l = delimeter_size + [_socket receive:((uint8_t *)buffer + delimeter_size) amount:(amount - delimeter_size)];
} }
pastHeader = YES; pastHeader = YES;
@ -73,16 +77,15 @@
uint8_t *bufferEnd = (uint8_t *)buffer + l; uint8_t *bufferEnd = (uint8_t *)buffer + l;
int amountRemaining = bufferEnd - bufferOffset; int amountRemaining = bufferEnd - bufferOffset;
/*
//For testing only //For testing only
FILE *testFout = fopen("header.raw", "w");
fwrite(buffer, 1, bufferOffset - (uint8_t *)buffer, testFout); fwrite(buffer, 1, bufferOffset - (uint8_t *)buffer, testFout);
fclose(testFout); fclose(testFout);
testFout = fopen("test.raw", "w"); testFout = fopen("test.raw", "w");
fwrite(bufferOffset, 1, amountRemaining, testFout); fwrite(bufferOffset, 1, amountRemaining, testFout);
fclose(testFout); fclose(testFout);
*/
memmove(buffer,bufferOffset, amountRemaining); memmove(buffer,bufferOffset, amountRemaining);
@ -91,12 +94,12 @@
else { else {
int l = [_socket receive:buffer amount:amount]; int l = [_socket receive:buffer amount:amount];
/*
//FOR TESTING ONLY //FOR TESTING ONLY
FILE *testFout = fopen("test.raw", "a"); FILE *testFout = fopen("test.raw", "a");
fwrite(buffer, 1, l, testFout); fwrite(buffer, 1, l, testFout);
fclose(testFout); fclose(testFout);
*/
if (l > 0) if (l > 0)
byteCount += l; byteCount += l;