Is there a binary build online for r183 (or anything later than r159)? The latest build at http://kismac.de/_trac/ is r159 -----Original Message----- From: kismac-bounce@xxxxxxxxxxxxx [mailto:kismac-bounce@xxxxxxxxxxxxx] On Behalf Of devnullian@xxxxxxx Sent: Sunday, September 03, 2006 1:23 AM To: kismac@xxxxxxxxxxxxx Subject: [kismac] Re: [binaervarianz] r183 - branches/usb-drivers/Sources/Driver/USBJack They started a new section called branches (instead of trunk) for the new drivers. Point your svnX to: https://svn.binaervarianz.de/kismac/ branches to get it. I would guess everything will get merged when the drivers are working and stable. This confused me too, until I browsed the repository via trac... devnullian On Sep 2, 2006, at 7:41 PM, John Warren wrote: > did I miss something. When I try to checkout the latest version, it > only says that there are 175. Did the address change again? > > Using svnX if it makes any difference. > > On 9/2/06, svn@xxxxxxxxxxxxxxxx <svn@xxxxxxxxxxxxxxxx> wrote: >> Author: gkruse >> Date: 2006-09-02 21:51:13 +0200 (Sat, 02 Sep 2006) >> New Revision: 183 >> >> Modified: >> branches/usb-drivers/Sources/Driver/USBJack/RalinkJack.mm >> Log: >> Just moving things around. This is slightly more stable but still >> has the same parsing problems. >> >> >> Modified: branches/usb-drivers/Sources/Driver/USBJack/RalinkJack.mm >> =================================================================== >> --- branches/usb-drivers/Sources/Driver/USBJack/RalinkJack.mm >> 2006-09-02 17:43:05 UTC (rev 182) >> +++ branches/usb-drivers/Sources/Driver/USBJack/RalinkJack.mm >> 2006-09-02 19:51:13 UTC (rev 183) >> @@ -852,48 +852,43 @@ >> bool RalinkJack::startCapture(UInt16 channel) { >> setChannel(channel); >> RTUSBWriteMACRegister(TXRX_CSR2, 0x4e); //enable monitor mode? >> - IOReturn ref; >> - ref = (*_interface)->ReadPipeAsync(_interface, kInPipe, >> &_recieveBuffer, sizeof(_recieveBuffer), (IOAsyncCallback1) >> _interruptRecieved, this); >> return true; >> } >> >> bool RalinkJack::_massagePacket(int len){ >> unsigned char* pData; >> - UInt8 frame[len*2]; >> + UInt8 frame[sizeof(_recieveBuffer)]; >> WLFrame * tempFrame; >> PRXD_STRUC pRxD; >> - WLIEEEFrame* testIeee; >> >> +if (len >= (sizeof(RXD_STRUC) + 24)) { >> tempFrame = (WLFrame *)frame; >> >> pData = (unsigned char*)&_recieveBuffer; >> >> - testIeee = (WLIEEEFrame*)pData; >> pRxD = (PRXD_STRUC)(pData + len - sizeof(RXD_STRUC)); >> - if (pRxD->Crc || pRxD->CiErr || pRxD->PhyErr) { >> + if (pRxD->Crc) { >> + //NSLog(@"Bad CRC"); >> return false; //its a bad packet, signal the interrupt >> to continue >> - } >> - >> - tempFrame->signal = pRxD->BBR1; >> - >> - //this should be a memcpy but I can't make it work! >> - tempFrame->frameControl = testIeee->frameControl; >> - tempFrame->duration = testIeee->duration; >> - tempFrame->idnum = testIeee->idnum; >> - tempFrame->sequenceControl = testIeee->sequenceControl; >> - tempFrame->dataLen = pRxD->DataByteCnt; >> - tempFrame->dataLen = NSSwapHostShortToLittle(tempFrame- >> >dataLen); >> - >> - memcpy(tempFrame->address1, testIeee->address1, 6); >> - memcpy(tempFrame->address2, testIeee->address2, 6); >> - memcpy(tempFrame->address3, testIeee->address3, 6); >> - memcpy(tempFrame->address4, testIeee->address4, 6); >> - memcpy(frame + sizeof(WLFrame) + sizeof(UInt16), pData+sizeof >> (WLIEEEFrame), len - sizeof(WLIEEEFrame)); >> - >> - memcpy(&_recieveBuffer, tempFrame, len + sizeof(WLPrismHeader)); >> - >> - return true; //override if needed >> + } >> + else if(pRxD->CiErr) { >> + //NSLog(@"CiErr"); >> + return false; //its a bad packet, signal the interrupt >> to continue >> + } >> + else if(pRxD->PhyErr) { >> + //NSLog(@"PhyErr"); >> + return false; //its a bad packet, signal the interrupt >> to continue >> + } >> + else { >> + // NSLog(@"Good Frame : %d, %d, %d", pRxD->Crc, pRxD- >> >CiErr, pRxD->PhyErr); >> + memcpy(frame + sizeof(WLPrismHeader), pData, sizeof >> (_recieveBuffer)); >> + tempFrame->signal = pRxD->BBR1; >> + memcpy(&_recieveBuffer, frame, sizeof(_recieveBuffer)); >> + return true; //override if needed >> + } >> } >> +return false; >> +} >> >> RalinkJack::RalinkJack() { >> _isEnabled = false; >> >> >> >