LinuxTV Patchwork reconnect to lirc socket even if it doesn't exist on startup

login
register
mail settings
Submitter L. Hanisch
Date Oct. 26, 2013, 4:32 p.m.
Message ID <526BEEB8.7010900@flensrocker.de>
Download mbox | patch
Permalink /patch/20474/
State New
Headers show

Comments

L. Hanisch - Oct. 26, 2013, 4:32 p.m.
Hi,

 The reconnect loop of cLircRemote will not be started if the socket does not exist at the time, vdr starts.
 In "fast boot" environments this may be true.

 The attached patch fixes this.

Regards,
Lars.

Patch

diff --git a/lirc.c b/lirc.c
index b88bd73..09905d0 100644
--- a/lirc.c
+++ b/lirc.c
@@ -21,11 +21,9 @@  cLircRemote::cLircRemote(const char *DeviceName)
 {
   addr.sun_family = AF_UNIX;
   strcpy(addr.sun_path, DeviceName);
-  if (Connect()) {
-     Start();
-     return;
-     }
-  f = -1;
+  if (!Connect())
+     f = -1;
+  Start();
 }
 
 cLircRemote::~cLircRemote()
@@ -67,14 +65,15 @@  void cLircRemote::Action(void)
   bool repeat = false;
   int timeout = -1;
 
-  while (Running() && f >= 0) {
+  while (Running()) {
 
-        bool ready = cFile::FileReady(f, timeout);
+        bool ready = f >= 0 ? cFile::FileReady(f, timeout) : false;
         int ret = ready ? safe_read(f, buf, sizeof(buf)) : -1;
 
-        if (ready && ret <= 0 ) {
+        if ((f < 0) || (ready && (ret <= 0))) {
            esyslog("ERROR: lircd connection broken, trying to reconnect every %.1f seconds", float(RECONNECTDELAY) / 1000);
-           close(f);
+           if (f >= 0)
+              close(f);
            f = -1;
            while (Running() && f < 0) {
                  cCondWait::SleepMs(RECONNECTDELAY);

Privacy Policy