aboutsummaryrefslogtreecommitdiff
path: root/src/transport/gnunet-transport-wlan-helper.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-08-15 21:54:06 +0000
committerChristian Grothoff <christian@grothoff.org>2011-08-15 21:54:06 +0000
commit5746309cb4be2073d550ad7a6885e918631dbc38 (patch)
tree89455bc4aadf977816b38df13f990372cd81d71a /src/transport/gnunet-transport-wlan-helper.c
parent6fd3e715cae09fa6e657c96f1c6f9711ee51f42f (diff)
downloadgnunet-5746309cb4be2073d550ad7a6885e918631dbc38.tar.gz
gnunet-5746309cb4be2073d550ad7a6885e918631dbc38.zip
indentation
Diffstat (limited to 'src/transport/gnunet-transport-wlan-helper.c')
-rw-r--r--src/transport/gnunet-transport-wlan-helper.c66
1 files changed, 28 insertions, 38 deletions
diff --git a/src/transport/gnunet-transport-wlan-helper.c b/src/transport/gnunet-transport-wlan-helper.c
index 1cfcf2c4e..b3468791d 100644
--- a/src/transport/gnunet-transport-wlan-helper.c
+++ b/src/transport/gnunet-transport-wlan-helper.c
@@ -135,10 +135,8 @@ check_crc_buf_osdep (unsigned char *buf, int len)
135 135
136 crc = calc_crc_osdep (buf, len); 136 crc = calc_crc_osdep (buf, len);
137 buf += len; 137 buf += len;
138 return (((crc) & 0xFF) == buf[0] && ((crc >> 8) & 0xFF) == buf[1] && ((crc 138 return (((crc) & 0xFF) == buf[0] && ((crc >> 8) & 0xFF) == buf[1] &&
139 >> 16) 139 ((crc >> 16) & 0xFF) == buf[2] && ((crc >> 24) & 0xFF) == buf[3]);
140 & 0xFF)
141 == buf[2] && ((crc >> 24) & 0xFF) == buf[3]);
142} 140}
143 141
144 142
@@ -387,8 +385,7 @@ openraw (struct Hardware_Infos *dev)
387 sll.sll_protocol = htons (ETH_P_ALL); 385 sll.sll_protocol = htons (ETH_P_ALL);
388 if (-1 == ioctl (dev->fd_raw, SIOCGIFHWADDR, &ifr)) 386 if (-1 == ioctl (dev->fd_raw, SIOCGIFHWADDR, &ifr))
389 { 387 {
390 fprintf (stderr, 388 fprintf (stderr, "ioctl(SIOCGIFHWADDR) on interface `%.*s' failed: %s\n",
391 "ioctl(SIOCGIFHWADDR) on interface `%.*s' failed: %s\n",
392 IFNAMSIZ, dev->iface, strerror (errno)); 389 IFNAMSIZ, dev->iface, strerror (errno));
393 return 1; 390 return 1;
394 } 391 }
@@ -408,8 +405,7 @@ openraw (struct Hardware_Infos *dev)
408 (ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211_FULL)) || 405 (ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211_FULL)) ||
409 (wrq.u.mode != IW_MODE_MONITOR)) 406 (wrq.u.mode != IW_MODE_MONITOR))
410 { 407 {
411 fprintf (stderr, 408 fprintf (stderr, "Error: interface `%.*s' is not in monitor mode\n",
412 "Error: interface `%.*s' is not in monitor mode\n",
413 IFNAMSIZ, dev->iface); 409 IFNAMSIZ, dev->iface);
414 return 1; 410 return 1;
415 } 411 }
@@ -432,9 +428,8 @@ openraw (struct Hardware_Infos *dev)
432 /* bind the raw socket to the interface */ 428 /* bind the raw socket to the interface */
433 if (-1 == bind (dev->fd_raw, (struct sockaddr *) &sll, sizeof (sll))) 429 if (-1 == bind (dev->fd_raw, (struct sockaddr *) &sll, sizeof (sll)))
434 { 430 {
435 fprintf (stderr, 431 fprintf (stderr, "Failed to bind interface `%.*s': %s\n", IFNAMSIZ,
436 "Failed to bind interface `%.*s': %s\n", 432 dev->iface, strerror (errno));
437 IFNAMSIZ, dev->iface, strerror (errno));
438 return 1; 433 return 1;
439 } 434 }
440 435
@@ -453,8 +448,7 @@ openraw (struct Hardware_Infos *dev)
453 (ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211_PRISM) && 448 (ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211_PRISM) &&
454 (ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211_FULL)) 449 (ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211_FULL))
455 { 450 {
456 fprintf (stderr, 451 fprintf (stderr, "Unsupported hardware link type %d on interface `%.*s'\n",
457 "Unsupported hardware link type %d on interface `%.*s'\n",
458 ifr.ifr_hwaddr.sa_family, IFNAMSIZ, dev->iface); 452 ifr.ifr_hwaddr.sa_family, IFNAMSIZ, dev->iface);
459 return 1; 453 return 1;
460 } 454 }
@@ -467,8 +461,7 @@ openraw (struct Hardware_Infos *dev)
467 setsockopt (dev->fd_raw, SOL_PACKET, PACKET_ADD_MEMBERSHIP, &mr, 461 setsockopt (dev->fd_raw, SOL_PACKET, PACKET_ADD_MEMBERSHIP, &mr,
468 sizeof (mr))) 462 sizeof (mr)))
469 { 463 {
470 fprintf (stderr, 464 fprintf (stderr, "Failed to enable promiscuous mode on interface `%.*s'\n",
471 "Failed to enable promiscuous mode on interface `%.*s'\n",
472 IFNAMSIZ, dev->iface); 465 IFNAMSIZ, dev->iface);
473 return 1; 466 return 1;
474 } 467 }
@@ -494,17 +487,16 @@ wlaninit (struct Hardware_Infos *dev, const char *iface)
494 } 487 }
495 if (dev->fd_raw >= FD_SETSIZE) 488 if (dev->fd_raw >= FD_SETSIZE)
496 { 489 {
497 fprintf (stderr, 490 fprintf (stderr, "File descriptor too large for select (%d > %d)\n",
498 "File descriptor too large for select (%d > %d)\n",
499 dev->fd_raw, FD_SETSIZE); 491 dev->fd_raw, FD_SETSIZE);
500 close (dev->fd_raw); 492 close (dev->fd_raw);
501 return 1; 493 return 1;
502 } 494 }
503 495
504 /* mac80211 stack detection */ 496 /* mac80211 stack detection */
505 ret = snprintf (strbuf, 497 ret =
506 sizeof (strbuf), 498 snprintf (strbuf, sizeof (strbuf), "/sys/class/net/%s/phy80211/subsystem",
507 "/sys/class/net/%s/phy80211/subsystem", iface); 499 iface);
508 if ((ret < 0) || (ret >= sizeof (strbuf)) || (0 != stat (strbuf, &sbuf))) 500 if ((ret < 0) || (ret >= sizeof (strbuf)) || (0 != stat (strbuf, &sbuf)))
509 { 501 {
510 fprintf (stderr, "Did not find 802.11 interface `%s'. Exiting.\n", iface); 502 fprintf (stderr, "Did not find 802.11 interface `%s'. Exiting.\n", iface);
@@ -634,8 +626,7 @@ maketest (unsigned char *buf, struct Hardware_Infos *dev)
634 static int first = 0; 626 static int first = 0;
635 627
636 const int rate = 11000000; 628 const int rate = 11000000;
637 static const char 629 static const char txt[] =
638 txt[] =
639 "Hallo1Hallo2 Hallo3 Hallo4...998877665544332211Hallo1Hallo2 Hallo3 Hallo4...998877665544332211"; 630 "Hallo1Hallo2 Hallo3 Hallo4...998877665544332211Hallo1Hallo2 Hallo3 Hallo4...998877665544332211";
640 631
641 unsigned char u8aRadiotap[] = { 0x00, 0x00, // <-- radiotap version 632 unsigned char u8aRadiotap[] = { 0x00, 0x00, // <-- radiotap version
@@ -686,14 +677,14 @@ maketest (unsigned char *buf, struct Hardware_Infos *dev)
686 } 677 }
687 678
688 tmp16 = (uint16_t *) u8aIeeeHeader.i_dur; 679 tmp16 = (uint16_t *) u8aIeeeHeader.i_dur;
689 *tmp16 680 *tmp16 =
690 =
691 (uint16_t) 681 (uint16_t)
692 htole16 ((sizeof (txt) + 682 htole16 ((sizeof (txt) +
693 sizeof (struct ieee80211_frame) * 1000000) / rate + 290); 683 sizeof (struct ieee80211_frame) * 1000000) / rate + 290);
694 tmp16 = (uint16_t *) u8aIeeeHeader.i_seq; 684 tmp16 = (uint16_t *) u8aIeeeHeader.i_seq;
695 *tmp16 = (*tmp16 & IEEE80211_SEQ_FRAG_MASK) | (htole16 (seqenz) 685 *tmp16 =
696 << IEEE80211_SEQ_SEQ_SHIFT); 686 (*tmp16 & IEEE80211_SEQ_FRAG_MASK) | (htole16 (seqenz) <<
687 IEEE80211_SEQ_SEQ_SHIFT);
697 seqenz++; 688 seqenz++;
698 689
699 memcpy (buf, u8aRadiotap, sizeof (u8aRadiotap)); 690 memcpy (buf, u8aRadiotap, sizeof (u8aRadiotap));
@@ -795,9 +786,9 @@ hardwaremode (int argc, char *argv[])
795 786
796 if (FD_ISSET (STDOUT_FILENO, &wfds)) 787 if (FD_ISSET (STDOUT_FILENO, &wfds))
797 { 788 {
798 ret = write (STDOUT_FILENO, 789 ret =
799 write_std.buf + write_std.pos, 790 write (STDOUT_FILENO, write_std.buf + write_std.pos,
800 write_std.size - write_std.pos); 791 write_std.size - write_std.pos);
801 if (0 > ret) 792 if (0 > ret)
802 { 793 {
803 fprintf (stderr, "Failed to write to STDOUT: %s\n", strerror (errno)); 794 fprintf (stderr, "Failed to write to STDOUT: %s\n", strerror (errno));
@@ -824,9 +815,8 @@ hardwaremode (int argc, char *argv[])
824 dev.write_pout.pos += ret; 815 dev.write_pout.pos += ret;
825 if ((dev.write_pout.pos != dev.write_pout.size) && (ret != 0)) 816 if ((dev.write_pout.pos != dev.write_pout.size) && (ret != 0))
826 { 817 {
827 fprintf (stderr, 818 fprintf (stderr, "Line %u: Write error, partial send: %u/%u\n",
828 "Line %u: Write error, partial send: %u/%u\n", __LINE__, 819 __LINE__, dev.write_pout.pos, dev.write_pout.size);
829 dev.write_pout.pos, dev.write_pout.size);
830 break; 820 break;
831 } 821 }
832 if (dev.write_pout.pos == dev.write_pout.size) 822 if (dev.write_pout.pos == dev.write_pout.size)
@@ -849,8 +839,8 @@ hardwaremode (int argc, char *argv[])
849 /* stop reading... */ 839 /* stop reading... */
850 stdin_open = 0; 840 stdin_open = 0;
851 } 841 }
852 GNUNET_SERVER_mst_receive (stdin_mst, NULL, 842 GNUNET_SERVER_mst_receive (stdin_mst, NULL, readbuf, ret, GNUNET_NO,
853 readbuf, ret, GNUNET_NO, GNUNET_NO); 843 GNUNET_NO);
854 } 844 }
855 845
856 if (FD_ISSET (dev.fd_raw, &rfds)) 846 if (FD_ISSET (dev.fd_raw, &rfds))
@@ -862,10 +852,10 @@ hardwaremode (int argc, char *argv[])
862 header = (struct GNUNET_MessageHeader *) write_std.buf; 852 header = (struct GNUNET_MessageHeader *) write_std.buf;
863 rxinfo = (struct Radiotap_rx *) &header[1]; 853 rxinfo = (struct Radiotap_rx *) &header[1];
864 datastart = (struct ieee80211_frame *) &rxinfo[1]; 854 datastart = (struct ieee80211_frame *) &rxinfo[1];
865 ret = linux_read (&dev, 855 ret =
866 (unsigned char *) datastart, 856 linux_read (&dev, (unsigned char *) datastart,
867 sizeof (write_std.buf) - sizeof (struct Radiotap_rx) - 857 sizeof (write_std.buf) - sizeof (struct Radiotap_rx) -
868 sizeof (struct GNUNET_MessageHeader), rxinfo); 858 sizeof (struct GNUNET_MessageHeader), rxinfo);
869 if (0 > ret) 859 if (0 > ret)
870 { 860 {
871 fprintf (stderr, "Read error from raw socket: %s\n", strerror (errno)); 861 fprintf (stderr, "Read error from raw socket: %s\n", strerror (errno));