Changeset 4156

Timestamp:

12/19/10 01:08:48 (12 years ago)

Author:

schlocke

Message:

oscam restart by webif

Location:

trunk

Files:

• globals.h (modified) (1 diff)
• oscam-config.h (modified) (1 diff)
• oscam-http.c (modified) (2 diffs)
• oscam.c (modified) (9 diffs)

trunk/globals.h

@@ -1294 +1294 @@
 
 // oscam
+extern void cs_exit_oscam();
+extern void cs_restart_oscam();
 extern int recv_from_udpipe(uchar *);
 extern char* username(struct s_client *);

trunk/oscam-config.h

@@ -8 +8 @@
 
 #ifndef WITH_SSL
-//#define WITH_SSL
+#define WITH_SSL
 #endif
 

trunk/oscam-http.c

@@ -2270 +2270 @@
         running = 0;
 
-        struct s_client *cl;
-        for (cl=first_client->next; cl ; cl=cl->next)
-            kill_thread(cl);
-        exit(SIGQUIT);
+        cs_exit_oscam();
+    }
+    else if (strcmp(getParam(params, "action"), "Restart") == 0) {
+        tpl_addVar(vars, 0, "STYLESHEET", CSS);
+        tpl_printf(vars, 0, "REFRESHTIME", "%d", 1);
+        tpl_addVar(vars, 0, "REFRESHURL", "status.html");
+        tpl_addVar(vars, 0, "REFRESH", tpl_getTpl(vars, "REFRESH"));
+        tpl_printf(vars, 0, "SECONDS", "%d", 1);
+        webif_write(tpl_getTpl(vars, "SHUTDOWN"), f);
+        running = 0;
+        
+        cs_restart_oscam();
+        
     } else {
         webif_write(tpl_getTpl(vars, "PRESHUTDOWN"), f);
@@ -2990 +2999 @@
     cs_log("HTTP Server: Shutdown requested from %s", inet_ntoa(*(struct in_addr *)&remote.sin_addr));
     close(sock);
-    exit(SIGQUIT);
+    //exit(SIGQUIT);
 }
 #endif

trunk/oscam.c

@@ -20 +20 @@
         Globals
 *****************************************************************************/
+int exit_oscam=0;
 struct s_module ph[CS_MAX_MOD]; // Protocols
 struct s_cardsystem cardsystem[CS_MAX_MOD]; // Protocols
@@ -574 +575 @@
 
     NULLFREE(cl);
-
-    exit(sig);  //clears all threads
 }
 
@@ -2997 +2996 @@
 }
 
+#ifdef WEBIF
+static void restart_daemon()
+{
+  while (1) {
+  
+    //start client process:
+    pid_t pid = fork(); 
+    if (!pid)
+      return; //client process=oscam process
+    if (pid < 0)
+      exit(1);
+    
+    //restart control process:
+    int res=0;
+    int status=0;
+    do {
+      res = waitpid(pid, &status, 0);
+      if (res==-1) {
+        if (errno!=EINTR)
+          exit(1);
+      }
+    } while (res!=pid);
+
+    status = WEXITSTATUS(status);
+    
+    //status=99 restart oscam, all other->terminate
+    if (status!=99) {
+      exit(status);
+    }
+  }
+}
+#endif
 
 int main (int argc, char *argv[])
 {
-
 
 if (pthread_key_create(&getclient, NULL)) {
@@ -3126 +3156 @@
       }
   }
+
+#ifdef OS_MACOSX
+  if (bg && daemon_compat(1,0))
+#else
+  if (bg && daemon(1,0))
+#endif
+  {
+    cs_log("Error starting in background (errno=%d: %s)", errno, strerror(errno));
+    cs_exit(1);
+  }
+
+#ifdef WEBIF
+  restart_daemon();  
+#endif
+
   if (cs_confdir[strlen(cs_confdir)]!='/') strcat(cs_confdir, "/");
   init_shm();
@@ -3173 +3218 @@
   first_client->fd_m2c_c=mfdr;
 
-#ifdef OS_MACOSX
-  if (bg && daemon_compat(1,0))
-#else
-  if (bg && daemon(1,0))
-#endif
-  {
-    cs_log("Error starting in background (errno=%d: %s)", errno, strerror(errno));
-    cs_exit(1);
-  }
-
   write_versionfile();
   server_pid = getpid();
@@ -3248 +3283 @@
 
     //cs_close_log();
-    while (1) {
+    while (!exit_oscam) {
         fd_set fds;
 
         do {
+                //timeout value for checking exit_oscam:
+                        struct timeval timeout;
+                        timeout.tv_sec = 1;
+                        timeout.tv_usec = 0;
+                        
+                        //Wait for incoming data
             FD_ZERO(&fds);
             FD_SET(mfdr, &fds);
@@ -3260 +3301 @@
                             FD_SET(ph[i].ptab->ports[j].fd, &fds);
             errno=0;
-            select(gfd, &fds, 0, 0, 0);
-        } while (errno==EINTR);
-
+            select(gfd, &fds, 0, 0, &timeout);
+        } while (errno==EINTR && !exit_oscam); //if timeout accurs and exit_oscam is set, we break the loop
+        
+        if (exit_oscam)
+                break;
+          
         first_client->last=time((time_t *)0);
 
@@ -3279 +3323 @@
     }
 
+        //can't kill? running endless...
+    //struct s_client *cl;
+    //for (cl=first_client->next;cl;cl=cl->next)
+    //  kill_thread(cl);
+      
 #ifdef AZBOX
   if (openxcas_close() < 0) {
@@ -3285 +3334 @@
 #endif
 
-    cs_exit(1);
-}
+    cs_exit(exit_oscam);
+    return exit_oscam;
+}
+
+#ifdef WEBIF
+void cs_exit_oscam()
+{
+  exit_oscam=1;
+  cs_log("exit oscam requested");
+}
+
+void cs_restart_oscam()
+{
+  exit_oscam=99;
+  cs_log("restart oscam requested");
+}
+#endif
 
 #ifdef CS_LED