Skip to content
Snippets Groups Projects
Commit 228baffe authored by Yann Garcia's avatar Yann Garcia
Browse files

Update config files

parent 4c66089e
No related branches found
No related tags found
No related merge requests found
......@@ -4,6 +4,6 @@ realm=vendors
login=guest
password=password
https_port=8888
cert_pem=/etc/its_bridge/certs/server.pem
cert_key=/etc/its_bridge/certs/server.key
cert_pem=/etc/its_bridge/certs/its_bridge.pem
cert_key=/etc/its_bridge/certs/its_bridge.key
conf_path=/etc/its_bridge
......@@ -647,13 +647,14 @@ int32_t main(const int32_t p_argc, char* const p_argv[]) {
fprintf(stderr, "Failed to parse configuration file: conf_path missing, exit.\n");
goto error;
}
printf("realm=%s, login=%s:%s, pem=%s, key=%s, conf_path=%s.\n", realm, login, password, cert_pem, cert_key, conf_path);
/* Daemonize */
if (daemonized) {
daemonize();
}
printf("realm=%s, login=%s:%s, pem=%s, key=%s, conf_path=%s.\n", realm, login, password, cert_pem, cert_key, conf_path);
/* Here is either the main process is not deamonized or th echild process if deamonized */
set_pid_file(PID_FILE_NAME); /* Set PID file */
set_lock_file(LOCK_FILE_NAME); /* Set lock file */
......
......@@ -349,11 +349,11 @@ void daemonize() {
}
if (pid > 0) {
printf("daemonize: parent exists.\n");
exit(0);
exit(2);
}
/* Child (daemon) continues */
printf("daemonize: child started: %d.\n", pid);
printf("daemonize: child started: %d.\n", getpid());
if (setsid() < 0) { /* Obtain a new process group */
fprintf(stderr, "daemonize: 'setsid' operation failure: %s.\n", strerror(errno));
exit(-1);
......@@ -366,7 +366,7 @@ void daemonize() {
i = open("/dev/null", O_RDWR); /* Redirection of standards outputs */
dup(i); dup(i);
umask(027); /* Set newly created file permissions */
umask(0); /* Set newly created file permissions */
/* Ignore part of signals */
signal(SIGCHLD,SIG_IGN);
......@@ -417,37 +417,43 @@ long get_file_size(const char *p_filename) {
if ((0 != fseek (fp, 0, SEEK_END)) || (-1 == (size = ftell (fp)))) {
size = 0;
}
fclose (fp);
fclose(fp);
return size;
} else {
fprintf(stderr, "get_file_size: Failed to open file: %s.\n", p_filename);
}
return 0;
}
char* load_file (const char *p_filename) {
size_t size = get_file_size (p_filename);
size_t size = get_file_size(p_filename);
if (size == 0) {
fprintf(stderr, "load_file: Wrong file size: %s.\n", p_filename);
return NULL;
}
FILE* fp = fopen (p_filename, "rb");
if (fp == NULL) {
fprintf(stderr, "load_file: Failed to open file: %s.\n", strerror(errno));
return NULL;
}
char* buffer = malloc(size + 1);
if (buffer == NULL) {
fprintf(stderr, "load_file: Failed to allocate memory: %s.\n", strerror(errno));
fclose (fp);
return NULL;
}
buffer[size] = '\0';
if ((long)fread (buffer, 1, size, fp) != size) {
if ((long)fread(buffer, 1, size, fp) != size) {
fprintf(stderr, "load_file: Failed to read file: %s.\n", strerror(errno));
free (buffer);
buffer = NULL;
}
fclose (fp);
fclose(fp);
return buffer;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment