/[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.94 by sysadm, Wed Nov 19 14:47:08 2025 UTC Revision 1.97 by sysadm, Fri Nov 28 03:23:58 2025 UTC
# Line 446  static int fork_server(void) Line 446  static int fork_server(void)
446    
447          SYS_child_process_count = 0;          SYS_child_process_count = 0;
448    
449            // BWF compile
450            if (bwf_compile() < 0)
451            {
452                    log_error("bwf_compile() error\n");
453                    goto cleanup;
454            }
455    
456          bbs_main();          bbs_main();
457    
458  cleanup:  cleanup:
# Line 482  cleanup: Line 489  cleanup:
489          ssh_free(SSH_session);          ssh_free(SSH_session);
490          ssh_finalize();          ssh_finalize();
491    
492            // BWF cleanup
493            bwf_cleanup();
494    
495          // Close Input and Output for client          // Close Input and Output for client
496          io_cleanup();          io_cleanup();
497          close(STDIN_FILENO);          close(STDIN_FILENO);
# Line 513  int net_server(const char *hostaddr, in_ Line 523  int net_server(const char *hostaddr, in_
523          time_t tm_notify_child_exit = time(NULL);          time_t tm_notify_child_exit = time(NULL);
524          int i, j;          int i, j;
525          pid_t pid;          pid_t pid;
526            int ssh_key_valid = 0;
527          int ssh_log_level = SSH_LOG_NOLOG;          int ssh_log_level = SSH_LOG_NOLOG;
528    
529  #ifdef HAVE_SYSTEMD_SD_DAEMON_H  #ifdef HAVE_SYSTEMD_SD_DAEMON_H
# Line 523  int net_server(const char *hostaddr, in_ Line 534  int net_server(const char *hostaddr, in_
534    
535          sshbind = ssh_bind_new();          sshbind = ssh_bind_new();
536    
537            if (ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_HOSTKEY, SSH_HOST_RSA_KEY_FILE) < 0)
538            {
539                    log_error("Error setting SSH RSA key: %s\n", SSH_HOST_RSA_KEY_FILE);
540            }
541            else
542            {
543                    ssh_key_valid = 1;
544            }
545            if (ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_HOSTKEY, SSH_HOST_ED25519_KEY_FILE) < 0)
546            {
547                    log_error("Error setting SSH ED25519 key: %s\n", SSH_HOST_ED25519_KEY_FILE);
548            }
549            else
550            {
551                    ssh_key_valid = 1;
552            }
553    
554            if (!ssh_key_valid)
555            {
556                    log_error("Error: no valid SSH host key\n");
557                    ssh_bind_free(sshbind);
558                    return -1;
559            }
560    
561          if (ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_BINDADDR, hostaddr) < 0 ||          if (ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_BINDADDR, hostaddr) < 0 ||
562                  ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_BINDPORT, &port) < 0 ||                  ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_BINDPORT, &port) < 0 ||
563                  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 ||  
564                  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)
565          {          {
566                  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));

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