mirror/rtl-sdr-blog
1
0
Fork 0
mirror of https://github.com/rtlsdrblog/rtl-sdr-blog.git synced 2024-12-27 19:38:27 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

rtl_tcp: proper linux support

Browse Source 
as well as some cosmetic fixes

Signed-off-by: Steve Markgraf <steve@steve-m.de>
This commit is contained in:
Hoernchen 2012-04-24 18:02:28 +02:00 committed by Steve Markgraf
parent e4fef23874
commit eb9a437de7
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/rtl_tcp.c
View File

@ -77,13 +77,14 @@ void usage(void)
#ifdef _WIN32 #ifdef _WIN32
printf("rtl-sdr, an I/Q recorder for RTL2832 based USB-sticks\n\n" printf("rtl-sdr, an I/Q recorder for RTL2832 based USB-sticks\n\n"
"Usage:\t rtl-sdr-win.exe [listen addr] [listen port] " "Usage:\t rtl-sdr-win.exe [listen addr] [listen port] "
"[samplerate in kHz] [frequency in hz]\n"); "[samplerate in kHz] [frequency in hz] [device index]\n");
#else #else
printf("rtl-sdr, an I/Q recorder for RTL2832 based USB-sticks\n\n" printf("rtl-sdr, an I/Q recorder for RTL2832 based USB-sticks\n\n"
"Usage:\t -a listen address\n" "Usage:\t -a listen address\n"
"\t[-p listen port (default: 1234)\n" "\t[-p listen port (default: 1234)\n"
"\t -f frequency to tune to [Hz]\n" "\t -f frequency to tune to [Hz]\n"
"\t[-s samplerate in kHz (default: 2048 kHz)]\n" "\t[-s samplerate in kHz (default: 2048 kHz)]\n"
"\t[-d device index (default: 0)]\n"
"\toutput filename\n"); "\toutput filename\n");
#endif #endif
exit(1); exit(1);
@ -200,7 +201,9 @@ static void *tcp_worker(void *arg)
while(bytesleft > 0) { while(bytesleft > 0) {
FD_ZERO(&writefds); FD_ZERO(&writefds);
FD_SET(s, &writefds); FD_SET(s, &writefds);
r = select(0+1, NULL, &writefds, NULL, &tv); tv.tv_sec = 1;
tv.tv_usec = 0;
r = select(s+1, NULL, &writefds, NULL, &tv);
if(r) { if(r) {
bytessent = send(s, &curelem->data[index], bytesleft, 0); bytessent = send(s, &curelem->data[index], bytesleft, 0);
if (bytessent == SOCKET_ERROR || do_exit) { if (bytessent == SOCKET_ERROR || do_exit) {
@ -250,7 +253,9 @@ static void *command_worker(void *arg)
while(left >0) { while(left >0) {
FD_ZERO(&readfds); FD_ZERO(&readfds);
FD_SET(s, &readfds); FD_SET(s, &readfds);
r = select(0+1, &readfds, NULL, NULL, &tv); tv.tv_sec = 1;
tv.tv_usec = 0;
r = select(s+1, &readfds, NULL, NULL, &tv);
if(r) { if(r) {
received = recv(s, (char*)&cmd+(sizeof(cmd)-left), left, 0); received = recv(s, (char*)&cmd+(sizeof(cmd)-left), left, 0);
if(received == SOCKET_ERROR || do_exit){ if(received == SOCKET_ERROR || do_exit){
@ -283,7 +288,7 @@ static void *command_worker(void *arg)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int r, opt, i; int r, opt, i;
char* addr; char* addr = "127.0.0.1";
int port = 1234; int port = 1234;
uint32_t frequency = 0, samp_rate = 2048000; uint32_t frequency = 0, samp_rate = 2048000;
struct sockaddr_in local, remote; struct sockaddr_in local, remote;
@ -303,13 +308,13 @@ int main(int argc, char **argv)
#endif #endif
#ifndef _WIN32 #ifndef _WIN32
struct sigaction sigact; struct sigaction sigact;
while ((opt = getopt(argc, argv, "a:p:f:s:")) != -1) { while ((opt = getopt(argc, argv, "a:p:f:s:d:")) != -1) {
switch (opt) { switch (opt) {
case 'f': case 'f':
frequency = atoi(optarg); frequency = atoi(optarg);
break; break;
case 's': case 's':
samp_rate = atoi(optarg); samp_rate = atoi(optarg)*1000;
break; break;
case 'a': case 'a':
addr = optarg; addr = optarg;
@ -317,13 +322,16 @@ int main(int argc, char **argv)
case 'p': case 'p':
port = atoi(optarg); port = atoi(optarg);
break; break;
case 'd':
dev_index = atoi(optarg);
break;
default: default:
usage(); usage();
break; break;
} }
} }
if (argc <= optind) if (argc < optind)
usage(); usage();
#else #else
@ -407,7 +415,7 @@ int main(int argc, char **argv)
ioctlsocket(listensocket, FIONBIO, &blockmode); ioctlsocket(listensocket, FIONBIO, &blockmode);
#else #else
r = fcntl(listensocket, F_GETFL, 0); r = fcntl(listensocket, F_GETFL, 0);
fcntl(listensocket, F_SETFL, r | O_NONBLOCK); r = fcntl(listensocket, F_SETFL, r | O_NONBLOCK);
#endif #endif
while(1) { while(1) {
@ -417,7 +425,9 @@ int main(int argc, char **argv)
while(1) { while(1) {
FD_ZERO(&readfds); FD_ZERO(&readfds);
FD_SET(listensocket, &readfds); FD_SET(listensocket, &readfds);
r = select(0+1, &readfds, NULL, NULL, &tv); tv.tv_sec = 1;
tv.tv_usec = 0;
r = select(listensocket+1, &readfds, NULL, NULL, &tv);
if(do_exit) { if(do_exit) {
goto out; goto out;
} else if(r) { } else if(r) {
@ -440,22 +450,21 @@ int main(int argc, char **argv)
rtlsdr_wait_async(dev, rtlsdr_callback, (void *)0); rtlsdr_wait_async(dev, rtlsdr_callback, (void *)0);
closesocket(s); closesocket(s);
if(!dead[0]){ if(!dead[0])
pthread_join(tcp_worker_thread, &status); pthread_join(tcp_worker_thread, &status);
}
if(!dead[1]){ if(!dead[1])
pthread_join(command_thread, &status); pthread_join(command_thread, &status);
}
printf("all threads dead..\n"); printf("all threads dead..\n");
curelem = ll_buffers; curelem = ll_buffers;
ll_buffers = 0; ll_buffers = 0;
while(curelem != 0) { while(curelem != 0) {
prev = curelem; prev = curelem;
curelem = curelem->next; curelem = curelem->next;
free(prev->data); free(prev->data);
free(prev); free(prev);
} }
do_exit = 0; do_exit = 0;