Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/neutrinolabs/pulseaudio-module-xrdp.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Sorg <jay.sorg@gmail.com>2019-11-19 12:42:48 +0300
committerJay Sorg <jay.sorg@gmail.com>2019-11-19 12:42:48 +0300
commit0bc53f5b40bf0c5bd0f66149f47f18b015483154 (patch)
treea20943dd3898d9c64459bb158139c9ad34347fa6
parent1d4947dc349cbf64f60fa429a5f60d38f38dfa7a (diff)
use fd -1 not 0 for invalid fd
-rw-r--r--src/module-xrdp-sink.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/module-xrdp-sink.c b/src/module-xrdp-sink.c
index 7a64c77..189f32a 100644
--- a/src/module-xrdp-sink.c
+++ b/src/module-xrdp-sink.c
@@ -256,7 +256,7 @@ static int data_send(struct userdata *u, pa_memchunk *chunk) {
struct header h;
struct sockaddr_un s;
- if (u->fd == 0) {
+ if (u->fd == -1) {
if (u->failed_connect_time != 0) {
if (pa_rtclock_now() - u->failed_connect_time < 1000000) {
return 0;
@@ -307,7 +307,7 @@ static int data_send(struct userdata *u, pa_memchunk *chunk) {
if (lsend(u->fd, (char*)(&h), 8) != 8) {
pa_log("data_send: send failed");
close(u->fd);
- u->fd = 0;
+ u->fd = -1;
return 0;
} else {
pa_log_debug("data_send: sent header ok bytes %d", bytes);
@@ -321,7 +321,7 @@ static int data_send(struct userdata *u, pa_memchunk *chunk) {
if (sent != bytes) {
pa_log("data_send: send failed sent %d bytes %d", sent, bytes);
close(u->fd);
- u->fd = 0;
+ u->fd = -1;
return 0;
}
@@ -332,7 +332,7 @@ static int close_send(struct userdata *u) {
struct header h;
pa_log("close_send:");
- if (u->fd == 0) {
+ if (u->fd == -1) {
return 0;
}
h.code = 1;
@@ -340,7 +340,7 @@ static int close_send(struct userdata *u) {
if (lsend(u->fd, (char*)(&h), 8) != 8) {
pa_log("close_send: send failed");
close(u->fd);
- u->fd = 0;
+ u->fd = -1;
return 0;
} else {
pa_log_debug("close_send: sent header ok");
@@ -497,6 +497,8 @@ int pa__init(pa_module*m) {
u->display_num = get_display_num_from_display(getenv("DISPLAY"));
+ u->fd = -1;
+
#if defined(PA_CHECK_VERSION)
#if PA_CHECK_VERSION(0, 9, 22)
if (!(u->thread = pa_thread_new("xrdp-sink", thread_func, u))) {