author | mickeyl <mickeyl> | 2003-10-10 00:15:28 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-10-10 00:15:28 (UTC) |
commit | c1a897e63513c9647666970794c1684b2439501e (patch) (unidiff) | |
tree | 6787f5b1731238c7010937dca220e97f116f19b7 | |
parent | 802c9ab6b89fd10f709aa012e8ff075e9b4a5d7f (diff) | |
download | opie-c1a897e63513c9647666970794c1684b2439501e.zip opie-c1a897e63513c9647666970794c1684b2439501e.tar.gz opie-c1a897e63513c9647666970794c1684b2439501e.tar.bz2 |
Question: What's wrong in select(1, [], NULL, NULL, {100, 0} = 0 (timeout) ?
Answer: It would help to give select the correct filedescriptor...
/me hugs strace
-rw-r--r-- | libopie2/opienet/onetwork.cpp | 2 | ||||
-rw-r--r-- | libopie2/opienet/opcap.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp index 767651e..dc2e388 100644 --- a/libopie2/opienet/onetwork.cpp +++ b/libopie2/opienet/onetwork.cpp | |||
@@ -532,129 +532,129 @@ void OWirelessNetworkInterface::buildChannelList() | |||
532 | } | 532 | } |
533 | // </check if the driver overwrites stuff> | 533 | // </check if the driver overwrites stuff> |
534 | 534 | ||
535 | struct iw_range range; | 535 | struct iw_range range; |
536 | memcpy( &range, buffer, sizeof range ); | 536 | memcpy( &range, buffer, sizeof range ); |
537 | 537 | ||
538 | qDebug( "OWirelessNetworkInterface::buildChannelList(): Interface %s reported to have %d channels.", name(), range.num_frequency ); | 538 | qDebug( "OWirelessNetworkInterface::buildChannelList(): Interface %s reported to have %d channels.", name(), range.num_frequency ); |
539 | for ( int i = 0; i < range.num_frequency; ++i ) | 539 | for ( int i = 0; i < range.num_frequency; ++i ) |
540 | { | 540 | { |
541 | int freq = (int) ( double( range.freq[i].m ) * pow( 10.0, range.freq[i].e ) / 1000000.0 ); | 541 | int freq = (int) ( double( range.freq[i].m ) * pow( 10.0, range.freq[i].e ) / 1000000.0 ); |
542 | _channels.insert( freq, i+1 ); | 542 | _channels.insert( freq, i+1 ); |
543 | } | 543 | } |
544 | } | 544 | } |
545 | 545 | ||
546 | qDebug( "OWirelessNetworkInterface::buildChannelList(): Channel list constructed." ); | 546 | qDebug( "OWirelessNetworkInterface::buildChannelList(): Channel list constructed." ); |
547 | free(buffer); | 547 | free(buffer); |
548 | } | 548 | } |
549 | 549 | ||
550 | 550 | ||
551 | void OWirelessNetworkInterface::buildPrivateList() | 551 | void OWirelessNetworkInterface::buildPrivateList() |
552 | { | 552 | { |
553 | qDebug( "OWirelessNetworkInterface::buildPrivateList()" ); | 553 | qDebug( "OWirelessNetworkInterface::buildPrivateList()" ); |
554 | 554 | ||
555 | struct iw_priv_args priv[IW_MAX_PRIV_DEF]; | 555 | struct iw_priv_args priv[IW_MAX_PRIV_DEF]; |
556 | 556 | ||
557 | _iwr.u.data.pointer = (char*) &priv; | 557 | _iwr.u.data.pointer = (char*) &priv; |
558 | _iwr.u.data.length = IW_MAX_PRIV_DEF; // length in terms of number of (sizeof iw_priv_args), not (sizeof iw_priv_args) itself | 558 | _iwr.u.data.length = IW_MAX_PRIV_DEF; // length in terms of number of (sizeof iw_priv_args), not (sizeof iw_priv_args) itself |
559 | _iwr.u.data.flags = 0; | 559 | _iwr.u.data.flags = 0; |
560 | 560 | ||
561 | if ( !wioctl( SIOCGIWPRIV ) ) | 561 | if ( !wioctl( SIOCGIWPRIV ) ) |
562 | { | 562 | { |
563 | qDebug( "OWirelessNetworkInterface::buildPrivateList(): SIOCGIWPRIV failed (%s) - can't get private ioctl information.", strerror( errno ) ); | 563 | qDebug( "OWirelessNetworkInterface::buildPrivateList(): SIOCGIWPRIV failed (%s) - can't get private ioctl information.", strerror( errno ) ); |
564 | return; | 564 | return; |
565 | } | 565 | } |
566 | 566 | ||
567 | for ( int i = 0; i < _iwr.u.data.length; ++i ) | 567 | for ( int i = 0; i < _iwr.u.data.length; ++i ) |
568 | { | 568 | { |
569 | new OPrivateIOCTL( this, priv[i].name, priv[i].cmd, priv[i].get_args, priv[i].set_args ); | 569 | new OPrivateIOCTL( this, priv[i].name, priv[i].cmd, priv[i].get_args, priv[i].set_args ); |
570 | } | 570 | } |
571 | qDebug( "OWirelessNetworkInterface::buildPrivateList(): Private IOCTL list constructed." ); | 571 | qDebug( "OWirelessNetworkInterface::buildPrivateList(): Private IOCTL list constructed." ); |
572 | } | 572 | } |
573 | 573 | ||
574 | 574 | ||
575 | int OWirelessNetworkInterface::channel() const | 575 | int OWirelessNetworkInterface::channel() const |
576 | { | 576 | { |
577 | //FIXME: When monitoring enabled, then use it | 577 | //FIXME: When monitoring enabled, then use it |
578 | //FIXME: to gather the current RF channel | 578 | //FIXME: to gather the current RF channel |
579 | //FIXME: Until then, get active channel from hopper. | 579 | //FIXME: Until then, get active channel from hopper. |
580 | if ( _hopper && _hopper->isActive() ) | 580 | if ( _hopper && _hopper->isActive() ) |
581 | return _hopper->channel(); | 581 | return _hopper->channel(); |
582 | 582 | ||
583 | if ( !wioctl( SIOCGIWFREQ ) ) | 583 | if ( !wioctl( SIOCGIWFREQ ) ) |
584 | { | 584 | { |
585 | return -1; | 585 | return -1; |
586 | } | 586 | } |
587 | else | 587 | else |
588 | { | 588 | { |
589 | return _channels[ static_cast<int>(double( _iwr.u.freq.m ) * pow( 10.0, _iwr.u.freq.e ) / 1000000) ]; | 589 | return _channels[ static_cast<int>(double( _iwr.u.freq.m ) * pow( 10.0, _iwr.u.freq.e ) / 1000000) ]; |
590 | } | 590 | } |
591 | } | 591 | } |
592 | 592 | ||
593 | 593 | ||
594 | void OWirelessNetworkInterface::setChannel( int c ) const | 594 | void OWirelessNetworkInterface::setChannel( int c ) const |
595 | { | 595 | { |
596 | if ( c ) | 596 | if ( !c ) |
597 | { | 597 | { |
598 | qWarning( "OWirelessNetworkInterface::setChannel( 0 ) called - fix your application!" ); | 598 | qWarning( "OWirelessNetworkInterface::setChannel( 0 ) called - fix your application!" ); |
599 | return; | 599 | return; |
600 | } | 600 | } |
601 | 601 | ||
602 | if ( !_mon ) | 602 | if ( !_mon ) |
603 | { | 603 | { |
604 | memset( &_iwr, 0, sizeof( struct iwreq ) ); | 604 | memset( &_iwr, 0, sizeof( struct iwreq ) ); |
605 | _iwr.u.freq.m = c; | 605 | _iwr.u.freq.m = c; |
606 | _iwr.u.freq.e = 0; | 606 | _iwr.u.freq.e = 0; |
607 | wioctl( SIOCSIWFREQ ); | 607 | wioctl( SIOCSIWFREQ ); |
608 | } | 608 | } |
609 | else | 609 | else |
610 | { | 610 | { |
611 | _mon->setChannel( c ); | 611 | _mon->setChannel( c ); |
612 | } | 612 | } |
613 | } | 613 | } |
614 | 614 | ||
615 | 615 | ||
616 | double OWirelessNetworkInterface::frequency() const | 616 | double OWirelessNetworkInterface::frequency() const |
617 | { | 617 | { |
618 | if ( !wioctl( SIOCGIWFREQ ) ) | 618 | if ( !wioctl( SIOCGIWFREQ ) ) |
619 | { | 619 | { |
620 | return -1.0; | 620 | return -1.0; |
621 | } | 621 | } |
622 | else | 622 | else |
623 | { | 623 | { |
624 | return double( _iwr.u.freq.m ) * pow( 10.0, _iwr.u.freq.e ) / 1000000000.0; | 624 | return double( _iwr.u.freq.m ) * pow( 10.0, _iwr.u.freq.e ) / 1000000000.0; |
625 | } | 625 | } |
626 | } | 626 | } |
627 | 627 | ||
628 | 628 | ||
629 | int OWirelessNetworkInterface::channels() const | 629 | int OWirelessNetworkInterface::channels() const |
630 | { | 630 | { |
631 | return _channels.count(); | 631 | return _channels.count(); |
632 | } | 632 | } |
633 | 633 | ||
634 | 634 | ||
635 | void OWirelessNetworkInterface::setChannelHopping( int interval ) | 635 | void OWirelessNetworkInterface::setChannelHopping( int interval ) |
636 | { | 636 | { |
637 | if ( !_hopper ) _hopper = new OChannelHopper( this ); | 637 | if ( !_hopper ) _hopper = new OChannelHopper( this ); |
638 | _hopper->setInterval( interval ); | 638 | _hopper->setInterval( interval ); |
639 | //FIXME: When and by whom will the channel hopper be deleted? | 639 | //FIXME: When and by whom will the channel hopper be deleted? |
640 | //TODO: rely on QObject hierarchy | 640 | //TODO: rely on QObject hierarchy |
641 | } | 641 | } |
642 | 642 | ||
643 | 643 | ||
644 | int OWirelessNetworkInterface::channelHopping() const | 644 | int OWirelessNetworkInterface::channelHopping() const |
645 | { | 645 | { |
646 | return _hopper->interval(); | 646 | return _hopper->interval(); |
647 | } | 647 | } |
648 | 648 | ||
649 | 649 | ||
650 | OChannelHopper* OWirelessNetworkInterface::channelHopper() const | 650 | OChannelHopper* OWirelessNetworkInterface::channelHopper() const |
651 | { | 651 | { |
652 | return _hopper; | 652 | return _hopper; |
653 | } | 653 | } |
654 | 654 | ||
655 | 655 | ||
656 | void OWirelessNetworkInterface::setMode( const QString& mode ) | 656 | void OWirelessNetworkInterface::setMode( const QString& mode ) |
657 | { | 657 | { |
658 | if ( mode == "auto" ) _iwr.u.mode = IW_MODE_AUTO; | 658 | if ( mode == "auto" ) _iwr.u.mode = IW_MODE_AUTO; |
659 | else if ( mode == "adhoc" ) _iwr.u.mode = IW_MODE_ADHOC; | 659 | else if ( mode == "adhoc" ) _iwr.u.mode = IW_MODE_ADHOC; |
660 | else if ( mode == "managed" ) _iwr.u.mode = IW_MODE_INFRA; | 660 | else if ( mode == "managed" ) _iwr.u.mode = IW_MODE_INFRA; |
diff --git a/libopie2/opienet/opcap.cpp b/libopie2/opienet/opcap.cpp index 38ca1a1..6331b2d 100644 --- a/libopie2/opienet/opcap.cpp +++ b/libopie2/opienet/opcap.cpp | |||
@@ -1082,129 +1082,129 @@ void OPacketCapturer::closeDumpFile() | |||
1082 | pcap_close( _pch ); | 1082 | pcap_close( _pch ); |
1083 | } | 1083 | } |
1084 | 1084 | ||
1085 | 1085 | ||
1086 | void OPacketCapturer::close() | 1086 | void OPacketCapturer::close() |
1087 | { | 1087 | { |
1088 | if ( _open ) | 1088 | if ( _open ) |
1089 | { | 1089 | { |
1090 | if ( _sn ) | 1090 | if ( _sn ) |
1091 | { | 1091 | { |
1092 | _sn->disconnect( SIGNAL( activated(int) ), this, SLOT( readyToReceive() ) ); | 1092 | _sn->disconnect( SIGNAL( activated(int) ), this, SLOT( readyToReceive() ) ); |
1093 | delete _sn; | 1093 | delete _sn; |
1094 | } | 1094 | } |
1095 | closeDumpFile(); | 1095 | closeDumpFile(); |
1096 | _open = false; | 1096 | _open = false; |
1097 | } | 1097 | } |
1098 | 1098 | ||
1099 | qDebug( "OPacketCapturer::close() --- dumping capturing statistics..." ); | 1099 | qDebug( "OPacketCapturer::close() --- dumping capturing statistics..." ); |
1100 | qDebug( "--------------------------------------------------" ); | 1100 | qDebug( "--------------------------------------------------" ); |
1101 | for( QMap<QString,int>::Iterator it = _stats.begin(); it != _stats.end(); ++it ) | 1101 | for( QMap<QString,int>::Iterator it = _stats.begin(); it != _stats.end(); ++it ) |
1102 | qDebug( "%s : %d", (const char*) it.key(), it.data() ); | 1102 | qDebug( "%s : %d", (const char*) it.key(), it.data() ); |
1103 | qDebug( "--------------------------------------------------" ); | 1103 | qDebug( "--------------------------------------------------" ); |
1104 | 1104 | ||
1105 | } | 1105 | } |
1106 | 1106 | ||
1107 | 1107 | ||
1108 | int OPacketCapturer::dataLink() const | 1108 | int OPacketCapturer::dataLink() const |
1109 | { | 1109 | { |
1110 | return pcap_datalink( _pch ); | 1110 | return pcap_datalink( _pch ); |
1111 | } | 1111 | } |
1112 | 1112 | ||
1113 | 1113 | ||
1114 | void OPacketCapturer::dump( OPacket* p ) | 1114 | void OPacketCapturer::dump( OPacket* p ) |
1115 | { | 1115 | { |
1116 | if ( !_pcd ) | 1116 | if ( !_pcd ) |
1117 | { | 1117 | { |
1118 | qWarning( "OPacketCapturer::dump() - cannot dump without open capture file!" ); | 1118 | qWarning( "OPacketCapturer::dump() - cannot dump without open capture file!" ); |
1119 | return; | 1119 | return; |
1120 | } | 1120 | } |
1121 | pcap_dump( (u_char*) _pcd, &p->_hdr, p->_data ); | 1121 | pcap_dump( (u_char*) _pcd, &p->_hdr, p->_data ); |
1122 | } | 1122 | } |
1123 | 1123 | ||
1124 | 1124 | ||
1125 | int OPacketCapturer::fileno() const | 1125 | int OPacketCapturer::fileno() const |
1126 | { | 1126 | { |
1127 | if ( _open ) | 1127 | if ( _open ) |
1128 | { | 1128 | { |
1129 | return pcap_fileno( _pch ); | 1129 | return pcap_fileno( _pch ); |
1130 | } | 1130 | } |
1131 | else | 1131 | else |
1132 | { | 1132 | { |
1133 | return -1; | 1133 | return -1; |
1134 | } | 1134 | } |
1135 | } | 1135 | } |
1136 | 1136 | ||
1137 | 1137 | ||
1138 | OPacket* OPacketCapturer::next( int time ) | 1138 | OPacket* OPacketCapturer::next( int time ) |
1139 | { | 1139 | { |
1140 | fd_set fds; | 1140 | fd_set fds; |
1141 | struct timeval tv; | 1141 | struct timeval tv; |
1142 | FD_ZERO( &fds ); | 1142 | FD_ZERO( &fds ); |
1143 | FD_SET( pcap_fileno( _pch ), &fds ); | 1143 | FD_SET( pcap_fileno( _pch ), &fds ); |
1144 | tv.tv_sec = time / 1000; | 1144 | tv.tv_sec = time / 1000; |
1145 | tv.tv_usec = time % 1000; | 1145 | tv.tv_usec = time % 1000; |
1146 | int retval = select( 1, &fds, NULL, NULL, &tv); | 1146 | int retval = select( pcap_fileno( _pch )+1, &fds, NULL, NULL, &tv); |
1147 | if ( retval > 0 ) // clear to read! | 1147 | if ( retval > 0 ) // clear to read! |
1148 | return next(); | 1148 | return next(); |
1149 | else | 1149 | else |
1150 | return 0; | 1150 | return 0; |
1151 | } | 1151 | } |
1152 | 1152 | ||
1153 | 1153 | ||
1154 | OPacket* OPacketCapturer::next() | 1154 | OPacket* OPacketCapturer::next() |
1155 | { | 1155 | { |
1156 | packetheaderstruct header; | 1156 | packetheaderstruct header; |
1157 | qDebug( "==> OPacketCapturer::next()" ); | 1157 | qDebug( "==> OPacketCapturer::next()" ); |
1158 | const unsigned char* pdata = pcap_next( _pch, &header ); | 1158 | const unsigned char* pdata = pcap_next( _pch, &header ); |
1159 | qDebug( "<== OPacketCapturer::next()" ); | 1159 | qDebug( "<== OPacketCapturer::next()" ); |
1160 | 1160 | ||
1161 | if ( pdata && header.len ) | 1161 | if ( pdata && header.len ) |
1162 | { | 1162 | { |
1163 | OPacket* p = new OPacket( dataLink(), header, pdata, 0 ); | 1163 | OPacket* p = new OPacket( dataLink(), header, pdata, 0 ); |
1164 | // packets shouldn't be inserted in the QObject child-parent hierarchy, | 1164 | // packets shouldn't be inserted in the QObject child-parent hierarchy, |
1165 | // because due to memory constraints they will be deleted as soon | 1165 | // because due to memory constraints they will be deleted as soon |
1166 | // as possible - that is right after they have been processed | 1166 | // as possible - that is right after they have been processed |
1167 | // by emit() [ see below ] | 1167 | // by emit() [ see below ] |
1168 | //TODO: make gathering statistics optional, because it takes time | 1168 | //TODO: make gathering statistics optional, because it takes time |
1169 | p->updateStats( _stats, const_cast<QObjectList*>( p->children() ) ); | 1169 | p->updateStats( _stats, const_cast<QObjectList*>( p->children() ) ); |
1170 | #ifndef NODEBUG | 1170 | #ifndef NODEBUG |
1171 | p->dumpStructure( const_cast<QObjectList*>( p->children() ) ); | 1171 | p->dumpStructure( const_cast<QObjectList*>( p->children() ) ); |
1172 | #endif | 1172 | #endif |
1173 | return p; | 1173 | return p; |
1174 | } | 1174 | } |
1175 | else | 1175 | else |
1176 | { | 1176 | { |
1177 | qWarning( "OPacketCapturer::next() - no packet received!" ); | 1177 | qWarning( "OPacketCapturer::next() - no packet received!" ); |
1178 | return 0; | 1178 | return 0; |
1179 | } | 1179 | } |
1180 | } | 1180 | } |
1181 | 1181 | ||
1182 | 1182 | ||
1183 | bool OPacketCapturer::open( const QString& name ) | 1183 | bool OPacketCapturer::open( const QString& name ) |
1184 | { | 1184 | { |
1185 | if ( _open ) | 1185 | if ( _open ) |
1186 | { | 1186 | { |
1187 | if ( name == _name ) // ignore opening an already openend device | 1187 | if ( name == _name ) // ignore opening an already openend device |
1188 | { | 1188 | { |
1189 | return true; | 1189 | return true; |
1190 | } | 1190 | } |
1191 | else // close the last opened device | 1191 | else // close the last opened device |
1192 | { | 1192 | { |
1193 | close(); | 1193 | close(); |
1194 | } | 1194 | } |
1195 | } | 1195 | } |
1196 | 1196 | ||
1197 | _name = name; | 1197 | _name = name; |
1198 | 1198 | ||
1199 | // open libpcap | 1199 | // open libpcap |
1200 | pcap_t* handle = pcap_open_live( const_cast<char*>( (const char*) name ), 1024, 0, 0, &_errbuf[0] ); | 1200 | pcap_t* handle = pcap_open_live( const_cast<char*>( (const char*) name ), 1024, 0, 0, &_errbuf[0] ); |
1201 | 1201 | ||
1202 | if ( !handle ) | 1202 | if ( !handle ) |
1203 | { | 1203 | { |
1204 | qWarning( "OPacketCapturer::open(): can't open libpcap with '%s': %s", (const char*) name, _errbuf ); | 1204 | qWarning( "OPacketCapturer::open(): can't open libpcap with '%s': %s", (const char*) name, _errbuf ); |
1205 | return false; | 1205 | return false; |
1206 | } | 1206 | } |
1207 | 1207 | ||
1208 | qDebug( "OPacketCapturer::open(): libpcap [%s] opened successfully.", (const char*) name ); | 1208 | qDebug( "OPacketCapturer::open(): libpcap [%s] opened successfully.", (const char*) name ); |
1209 | _pch = handle; | 1209 | _pch = handle; |
1210 | _open = true; | 1210 | _open = true; |