Merge pull request #3 from hackrid/master

Adding RX and TX graphs to the plot

Author: cnlohr

Makefile

@@ -2,6 +2,10 @@ all : wifirx
 
 LDFLAGS:=-lX11 -lm -lpthread -lXinerama -lXext
 
+
+%.o: %.c
+	gcc -c -o $@ $< -g3 -O0
+	
 wifirx : wifirx.o XDriver.o DrawFunctions.o
 	gcc -o $@ $^ $(LDFLAGS)
 

README.md

@@ -1,2 +1,7 @@
 # wifirxpower
 Linux-based WiFi RX Power Grapher
+
+Screenshot: 
+![alt text][logo]
+
+[logo]: https://github.com/hackrid/wifirxpower/blob/master/wifirx_tx_rx.png "wifirxpower"

wifirx.c

@@ -99,6 +99,43 @@ unsigned long HSVtoHEX( float hue, float sat, float value )
 
 int first = 0;
 
+#define TX_BITRATE_LINE 14
+#define RX_BITRATE_LINE 15
+#define MBIT_OFFSET		12
+
+void GetBitRates(const char * command, int *tx_bitrate, int *rx_bitrate)
+{
+	FILE *fp;
+	char line[1035];
+	int i = 0;
+
+	/* Open the command for reading. */
+	fp = popen(command, "r");
+	if (fp == NULL) {
+		printf("Failed to run command\n");
+		exit(1);
+	}
+
+	/* Read the output a line at a time*/
+	while (fgets(line, sizeof(line) - 1, fp) != NULL)
+	{
+		if ((i == TX_BITRATE_LINE))
+		{
+			//printf("%s", line);
+			*tx_bitrate = strtol(line+MBIT_OFFSET,0,10);
+		}
+
+		if (i == RX_BITRATE_LINE)
+		{
+			//printf("%s", line);
+			*rx_bitrate = strtol(line+MBIT_OFFSET,0,10);
+		}
+		i++;
+	}
+
+	pclose(fp);
+}
+
 int GetQuality( const char * interface, int * noise )
 {
 	int sockfd;
@@ -155,7 +192,11 @@ int get_color( int nr )
 
 #define POWERHISTORY 1024
 double powers[POWERHISTORY];
+double tx_rates[POWERHISTORY];
+double rx_rates[POWERHISTORY];
+
 short screenx, screeny;
+unsigned char iw_command_buff[100];
 
 int main( int argc, char ** argv )
 {
@@ -194,6 +235,8 @@ int main( int argc, char ** argv )
 
 	printf( "MIN: %f / MAX: %f\n", min, max );
 
+	sprintf(iw_command_buff,"iw dev %s station dump", argv[1]);
+
 	CNFGBGColor = 0x800000;
 	CNFGDialogColor = 0x444444;
 	CNFGSetup( "WifiRX", 640, 480 );
@@ -205,6 +248,9 @@ int main( int argc, char ** argv )
 		int noise;
 		double noisetot = 0;
 		first = 1;
+		int tx_bitrate;
+		int rx_bitrate;
+
 		for( i = 0; i < 30; i++ )
 		{
 			j += GetQuality( argv[1], &noise );
@@ -213,8 +259,14 @@ int main( int argc, char ** argv )
 		}
 		j/=TITER;
 		noise/=TITER;
-		printf( "%4.1f %4.1f\n", j, noisetot );
+
+		GetBitRates(iw_command_buff, &tx_bitrate, &rx_bitrate);
+
+		printf( "Sig: %4.1f dBm Noise: %4.1f \nTX: %d MBit/s (red) RX: %d MBit/s (green)\n", j, noisetot, tx_bitrate, rx_bitrate);
+
 		powers[pl] = j;
+		tx_rates[pl] = tx_bitrate;
+		rx_rates[pl] = rx_bitrate;
 		pl++;
 		if( pl >= POWERHISTORY ) pl = 0;
 
@@ -245,6 +297,15 @@ int main( int argc, char ** argv )
 				k += POWERHISTORY;
 			CNFGColor( get_color( powers[k] ) );
 			CNFGTackSegment( i, 0, i, -(powers[k]+20)*(screeny/(100.0-20)) );
+
+			CNFGColor(0xFF); //red
+			CNFGTackPixel(i, tx_rates[k]);
+			CNFGTackPixel(i, tx_rates[k]+1);
+
+			CNFGColor(0xFF00); //green
+			CNFGTackPixel(i, rx_rates[k]);
+			CNFGTackPixel(i, rx_rates[k]+1);
+
 		}
 		CNFGColor( 0xffffff );