/[LeafOK_CVS]/lbbs/src/net_server.c
ViewVC logotype

Diff of /lbbs/src/net_server.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.96 by sysadm, Fri Nov 21 10:34:10 2025 UTC Revision 1.98 by sysadm, Mon Dec 1 08:17:28 2025 UTC
# Line 422  static int fork_server(void) Line 422  static int fork_server(void)
422                          log_error("Error setting SSH options: %s\n", ssh_get_error(SSH_session));                          log_error("Error setting SSH options: %s\n", ssh_get_error(SSH_session));
423                          goto cleanup;                          goto cleanup;
424                  }                  }
425    
426                    ssh_set_blocking(SSH_session, 0);
427          }          }
428    
429          // Redirect Input          // Redirect Input
# Line 523  int net_server(const char *hostaddr, in_ Line 525  int net_server(const char *hostaddr, in_
525          time_t tm_notify_child_exit = time(NULL);          time_t tm_notify_child_exit = time(NULL);
526          int i, j;          int i, j;
527          pid_t pid;          pid_t pid;
528            int ssh_key_valid = 0;
529          int ssh_log_level = SSH_LOG_NOLOG;          int ssh_log_level = SSH_LOG_NOLOG;
530    
531  #ifdef HAVE_SYSTEMD_SD_DAEMON_H  #ifdef HAVE_SYSTEMD_SD_DAEMON_H
# Line 533  int net_server(const char *hostaddr, in_ Line 536  int net_server(const char *hostaddr, in_
536    
537          sshbind = ssh_bind_new();          sshbind = ssh_bind_new();
538    
539            if (ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_HOSTKEY, SSH_HOST_RSA_KEY_FILE) < 0)
540            {
541                    log_error("Error setting SSH RSA key: %s\n", SSH_HOST_RSA_KEY_FILE);
542            }
543            else
544            {
545                    ssh_key_valid = 1;
546            }
547            if (ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_HOSTKEY, SSH_HOST_ED25519_KEY_FILE) < 0)
548            {
549                    log_error("Error setting SSH ED25519 key: %s\n", SSH_HOST_ED25519_KEY_FILE);
550            }
551            else
552            {
553                    ssh_key_valid = 1;
554            }
555    
556            if (!ssh_key_valid)
557            {
558                    log_error("Error: no valid SSH host key\n");
559                    ssh_bind_free(sshbind);
560                    return -1;
561            }
562    
563          if (ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_BINDADDR, hostaddr) < 0 ||          if (ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_BINDADDR, hostaddr) < 0 ||
564                  ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_BINDPORT, &port) < 0 ||                  ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_BINDPORT, &port) < 0 ||
565                  ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_HOSTKEY, SSH_HOST_KEYFILE) < 0 ||                  ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_HOSTKEY_ALGORITHMS, "ssh-rsa,rsa-sha2-512,rsa-sha2-256,ssh-ed25519") < 0 ||
                 ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_HOSTKEY_ALGORITHMS, "ssh-rsa,rsa-sha2-512,rsa-sha2-256") < 0 ||  
566                  ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_LOG_VERBOSITY, &ssh_log_level) < 0)                  ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_LOG_VERBOSITY, &ssh_log_level) < 0)
567          {          {
568                  log_error("Error setting SSH bind options: %s\n", ssh_get_error(sshbind));                  log_error("Error setting SSH bind options: %s\n", ssh_get_error(sshbind));
# Line 614  int net_server(const char *hostaddr, in_ Line 640  int net_server(const char *hostaddr, in_
640                  fcntl(socket_server[i], F_SETFL, flags_server[i] | O_NONBLOCK);                  fcntl(socket_server[i], F_SETFL, flags_server[i] | O_NONBLOCK);
641          }          }
642    
643            ssh_bind_set_blocking(sshbind, 0);
644    
645          hash_dict_pid_sockaddr = hash_dict_create(MAX_CLIENT_LIMIT);          hash_dict_pid_sockaddr = hash_dict_create(MAX_CLIENT_LIMIT);
646          if (hash_dict_pid_sockaddr == NULL)          if (hash_dict_pid_sockaddr == NULL)
647          {          {

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
webmaster@leafok.com
 ViewVC Help
Powered by ViewVC 1.3.0-beta1