1
1

Merge branch 'master' of git://git.libssh.org/projects/libssh/libssh

Этот коммит содержится в:
Aris Adamantiadis 2009-12-19 00:10:13 +01:00
родитель a1870a62cf bebbac1bd8
Коммит 0dcb63ff5e
2 изменённых файлов: 64 добавлений и 61 удалений

Просмотреть файл

@ -1356,7 +1356,7 @@ CALL_GRAPH = NO
# the time of a run. So in most cases it will be better to enable caller # the time of a run. So in most cases it will be better to enable caller
# graphs for selected functions only using the \callergraph command. # graphs for selected functions only using the \callergraph command.
CALLER_GRAPH = YES CALLER_GRAPH = NO
# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
# will graphical hierarchy of all classes instead of a textual one. # will graphical hierarchy of all classes instead of a textual one.

Просмотреть файл

@ -226,140 +226,143 @@ char *dir_expand_dup(ssh_session session, const char *value, int allowsshdir) {
* @param type The option type to set. This could be one of the * @param type The option type to set. This could be one of the
* following: * following:
* *
* SSH_OPTIONS_HOST: * - SSH_OPTIONS_HOST:
* The hostname or ip address to connect to (string). * The hostname or ip address to connect to (string).
* *
* SSH_OPTIONS_PORT: * - SSH_OPTIONS_PORT:
* The port to connect to (integer). * The port to connect to (integer).
* *
* SSH_OPTIONS_PORT_STR: * - SSH_OPTIONS_PORT_STR:
* The port to connect to (string). * The port to connect to (string).
* *
* SSH_OPTIONS_FD: * - SSH_OPTIONS_FD:
* The file descriptor to use (socket_t). * The file descriptor to use (socket_t).\n
* * \n
* If you wish to open the socket yourself for a reason * If you wish to open the socket yourself for a reason
* or another, set the file descriptor. Don't forget to * or another, set the file descriptor. Don't forget to
* set the hostname as the hostname is used as a key in * set the hostname as the hostname is used as a key in
* the known_host mechanism. * the known_host mechanism.
* *
* SSH_OPTIONS_USER: * - SSH_OPTIONS_USER:
* The username for authentication (string). * The username for authentication (string).\n
* * \n
* If the value is NULL, the username is set to the * If the value is NULL, the username is set to the
* default username. * default username.
* *
* SSH_OPTIONS_SSH_DIR: * - SSH_OPTIONS_SSH_DIR:
* Set the ssh directory (format string). * Set the ssh directory (format string).\n
* * \n
* If the value is NULL, the directory is set to the * If the value is NULL, the directory is set to the
* default ssh directory. * default ssh directory.\n
* * \n
* The ssh directory is used for files like known_hosts * The ssh directory is used for files like known_hosts
* and identity (private and public key). It may include * and identity (private and public key). It may include
* "%s" which will be replaced by the user home * "%s" which will be replaced by the user home
* directory. * directory.
* *
* SSH_OPTIONS_KNOWNHOSTS: * - SSH_OPTIONS_KNOWNHOSTS:
* Set the known hosts file name (format string). * Set the known hosts file name (format string).\n
* * \n
* If the value is NULL, the directory is set to the * If the value is NULL, the directory is set to the
* default known hosts file, normally ~/.ssh/known_hosts. * default known hosts file, normally
* * ~/.ssh/known_hosts.\n
* \n
* The known hosts file is used to certify remote hosts * The known hosts file is used to certify remote hosts
* are genuine. It may include "%s" which will be * are genuine. It may include "%s" which will be
* replaced by the user home directory. * replaced by the user home directory.
* *
* SSH_OPTIONS_IDENTITY: * - SSH_OPTIONS_IDENTITY:
* Set the identity file name (format string). * Set the identity file name (format string).\n
* * \n
* By default identity, id_dsa and id_rsa are checked. * By default identity, id_dsa and id_rsa are checked.\n
* * \n
* The identity file used authenticate with public key. * The identity file used authenticate with public key.
* It may include "%s" which will be replaced by the * It may include "%s" which will be replaced by the
* user home directory. * user home directory.
* *
* SSH_OPTIONS_TIMEOUT: * - SSH_OPTIONS_TIMEOUT:
* Set a timeout for the connection in seconds (integer). * Set a timeout for the connection in seconds (integer).
* *
* SSH_OPTIONS_TIMEOUT_USEC: * - SSH_OPTIONS_TIMEOUT_USEC:
* Set a timeout for the connection in micro seconds * Set a timeout for the connection in micro seconds
* (integer). * (integer).
* *
* SSH_OPTIONS_SSH1: * - SSH_OPTIONS_SSH1:
* Allow or deny the connection to SSH1 servers * Allow or deny the connection to SSH1 servers
* (integer). * (integer).
* *
* SSH_OPTIONS_SSH2: * - SSH_OPTIONS_SSH2:
* Allow or deny the connection to SSH2 servers * Allow or deny the connection to SSH2 servers
* (integer). * (integer).
* *
* SSH_OPTIONS_LOG_VERBOSITY: * - SSH_OPTIONS_LOG_VERBOSITY:
* Set the session logging verbosity (integer). * Set the session logging verbosity (integer).\n
* * \n
* The verbosity of the messages. Every log smaller or * The verbosity of the messages. Every log smaller or
* equal to verbosity will be shown. * equal to verbosity will be shown.
* SSH_LOG_NOLOG: No logging * - SSH_LOG_NOLOG: No logging
* SSH_LOG_RARE: Rare conditions or warnings * - SSH_LOG_RARE: Rare conditions or warnings
* SSH_LOG_ENTRY: API-accessible entrypoints * - SSH_LOG_ENTRY: API-accessible entrypoints
* SSH_LOG_PACKET: Packet id and size * - SSH_LOG_PACKET: Packet id and size
* SSH_LOG_FUNCTIONS: Function entering and leaving * - SSH_LOG_FUNCTIONS: Function entering and leaving
*
* SSH_OPTIONS_LOG_VERBOSITY_STR:
* Set the session logging verbosity (string).
* *
* - SSH_OPTIONS_LOG_VERBOSITY_STR:
* Set the session logging verbosity (string).\n
* \n
* The verbosity of the messages. Every log smaller or * The verbosity of the messages. Every log smaller or
* equal to verbosity will be shown. * equal to verbosity will be shown.
* SSH_LOG_NOLOG: No logging * - SSH_LOG_NOLOG: No logging
* SSH_LOG_RARE: Rare conditions or warnings * - SSH_LOG_RARE: Rare conditions or warnings
* SSH_LOG_ENTRY: API-accessible entrypoints * - SSH_LOG_ENTRY: API-accessible entrypoints
* SSH_LOG_PACKET: Packet id and size * - SSH_LOG_PACKET: Packet id and size
* SSH_LOG_FUNCTIONS: Function entering and leaving * - SSH_LOG_FUNCTIONS: Function entering and leaving
* * \n
* See the corresponding numbers in libssh.h. * See the corresponding numbers in libssh.h.
* *
* SSH_OPTTIONS_AUTH_CALLBACK: * - SSH_OPTTIONS_AUTH_CALLBACK:
* Set a callback to use your own authentication function * Set a callback to use your own authentication function
* (function pointer). * (function pointer).
* *
* SSH_OPTTIONS_AUTH_USERDATA: * - SSH_OPTTIONS_AUTH_USERDATA:
* Set the user data passed to the authentication function * Set the user data passed to the authentication
* (generic pointer). * function (generic pointer).
* *
* SSH_OPTTIONS_LOG_CALLBACK: * - SSH_OPTTIONS_LOG_CALLBACK:
* Set a callback to use your own logging function * Set a callback to use your own logging function
* (function pointer). * (function pointer).
* *
* SSH_OPTTIONS_LOG_USERDATA: * - SSH_OPTTIONS_LOG_USERDATA:
* Set the user data passed to the logging function * Set the user data passed to the logging function
* (generic pointer). * (generic pointer).
* *
* SSH_OPTTIONS_STATUS_CALLBACK: * - SSH_OPTTIONS_STATUS_CALLBACK:
* Set a callback to show connection status in realtime * Set a callback to show connection status in realtime
* (function pointer). * (function pointer).\n
* * \n
* @code
* fn(void *arg, float status) * fn(void *arg, float status)
* * @endcode
* \n
* During ssh_connect(), libssh will call the callback * During ssh_connect(), libssh will call the callback
* with status from 0.0 to 1.0. * with status from 0.0 to 1.0.
* *
* SSH_OPTTIONS_STATUS_ARG: * - SSH_OPTTIONS_STATUS_ARG:
* Set the status argument which should be passed to the * Set the status argument which should be passed to the
* status callback (generic pointer). * status callback (generic pointer).
* *
* SSH_OPTIONS_CIPHERS_C_S: * - SSH_OPTIONS_CIPHERS_C_S:
* Set the symmetric cipher client to server (string, * Set the symmetric cipher client to server (string,
* comma-separated list). * comma-separated list).
* *
* SSH_OPTIONS_CIPHERS_S_C: * - SSH_OPTIONS_CIPHERS_S_C:
* Set the symmetric cipher server to client (string, * Set the symmetric cipher server to client (string,
* comma-separated list). * comma-separated list).
* *
* SSH_OPTIONS_COMPRESSION_C_S: * - SSH_OPTIONS_COMPRESSION_C_S:
* Set the compression to use for client to server * Set the compression to use for client to server
* communication (string, "none" or "zlib"). * communication (string, "none" or "zlib").
* *
* SSH_OPTIONS_COMPRESSION_S_C: * - SSH_OPTIONS_COMPRESSION_S_C:
* Set the compression to use for server to client * Set the compression to use for server to client
* communication (string, "none" or "zlib"). * communication (string, "none" or "zlib").
* *