diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-06-17 20:25:35 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-06-17 20:25:35 +0000 |
commit | ebeff682c1817da3ea6d274731416d6e95cd9dd2 (patch) | |
tree | dd192d057ac42d04ff3c035f50210c09e90e9fd0 /src/transport/gnunet-helper-transport-bluetooth.c | |
parent | ce22207c5cd930ec86a558c1a908148ee7c938b4 (diff) | |
download | gnunet-ebeff682c1817da3ea6d274731416d6e95cd9dd2.tar.gz gnunet-ebeff682c1817da3ea6d274731416d6e95cd9dd2.zip |
-handle case where sendsocket is still -1
Diffstat (limited to 'src/transport/gnunet-helper-transport-bluetooth.c')
-rw-r--r-- | src/transport/gnunet-helper-transport-bluetooth.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/transport/gnunet-helper-transport-bluetooth.c b/src/transport/gnunet-helper-transport-bluetooth.c index 42bb96f53..2d1b67dfe 100644 --- a/src/transport/gnunet-helper-transport-bluetooth.c +++ b/src/transport/gnunet-helper-transport-bluetooth.c | |||
@@ -1948,13 +1948,13 @@ main (int argc, char *argv[]) | |||
1948 | fprintf (stderr, "LOG : %s sends a message to STDOUT\n", dev.iface); //FIXME: debugging message | 1948 | fprintf (stderr, "LOG : %s sends a message to STDOUT\n", dev.iface); //FIXME: debugging message |
1949 | 1949 | ||
1950 | } | 1950 | } |
1951 | if (sendsocket != -1) | 1951 | if (-1 != sendsocket) |
1952 | { | 1952 | { |
1953 | if (FD_ISSET (sendsocket , &wfds)) | 1953 | if (FD_ISSET (sendsocket , &wfds)) |
1954 | { | 1954 | { |
1955 | ssize_t ret = | 1955 | ssize_t ret = write (sendsocket, |
1956 | write (sendsocket, write_pout.buf + write_std.pos, | 1956 | write_pout.buf + write_std.pos, |
1957 | write_pout.size - write_pout.pos); | 1957 | write_pout.size - write_pout.pos); |
1958 | if (0 > ret) //FIXME should I first check the error type? | 1958 | if (0 > ret) //FIXME should I first check the error type? |
1959 | { | 1959 | { |
1960 | fprintf (stderr, "Failed to write to bluetooth device: %s. Closing the socket!\n", | 1960 | fprintf (stderr, "Failed to write to bluetooth device: %s. Closing the socket!\n", |
@@ -2101,7 +2101,8 @@ main (int argc, char *argv[]) | |||
2101 | stdin_mst = NULL; | 2101 | stdin_mst = NULL; |
2102 | sdp_close (dev.session); | 2102 | sdp_close (dev.session); |
2103 | (void) close (dev.fd_rfcomm); | 2103 | (void) close (dev.fd_rfcomm); |
2104 | (void) close (sendsocket); | 2104 | if (-1 != sendsocket) |
2105 | (void) close (sendsocket); | ||
2105 | 2106 | ||
2106 | for (i = 0; i < crt_rfds; i++) | 2107 | for (i = 0; i < crt_rfds; i++) |
2107 | (void) close (rfds_list[i]); | 2108 | (void) close (rfds_list[i]); |