Attachment 884 Details for Bug 1014 – Modified code and scp results

Modified code and scp results

Modification-Results (text/plain), 7.16 KB, created by Chris on 2005-04-21 05:42:37 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Chris

Created: 2005-04-21 05:42:37 AEST

Size: 7.16 KB

patch

obsolete

>Code Modification:
>
>============================================================================
>==>>  Misc.c
>
>	/* disable nagle on socket */
>	void
>	set_nodelay(int fd)
>	{
>	        int opt;
>	        socklen_t optlen;
>	
>	
>++		debug("--->> DEBUG PATH - disable nagle on socket - DEBUG PATH");
>++      	return;
>
>        	optlen = sizeof opt;
>        	if (getsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &opt, &optlen) == -1) {
>	                error("getsockopt TCP_NODELAY: %.100s", strerror(errno));
>                	return;
>        	}
>        	if (opt == 1) {
>	                debug2("fd %d is TCP_NODELAY", fd);
>                	return;
>        	}
>        	opt = 1;
>        	debug2("fd %d setting TCP_NODELAY", fd);
>        	if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof opt) == -1)
>	                error("setsockopt TCP_NODELAY: %.100s", strerror(errno));
>	}
>
>
>============================================================================
>==>>  Readconf.c
>
>	int
>	read_config_file(const char *filename, const char *host, Options *options)
>	{
>	        FILE *f;
>	        char line[1024];
>	        int active, linenum;
>	        int bad_options = 0;
>
>	       	/* Open the file. */
>	        f = fopen(filename, "r");
>	        if (!f)
>                	return 0;
>
>
>++        	debug("DEBUG VERSION OF SCP - CREATED TODAY  ");
>        	debug("Reading configuration data %.200s", filename);
>
>        	/*
>         	* Mark that we are now processing the options.  This flag is turned
>         	* on/off by Host specifications.
>         	*/
>        	active = 1;
>        	linenum = 0;
>        	while (fgets(line, sizeof(line), f)) {
>	                /* Update line number counter. */
>                	linenum++;
>                	if (process_config_line(options, host, line, filename, linenum, &active) != 0)
>	                        bad_options++;
>	        }
>	        fclose(f);
>	        if (bad_options > 0)
>                	fatal("%s: terminating, %d bad configuration options",
>                    	filename, bad_options);
>        	return 1;
>	}
>
>
>============================================================================
>
>Testing Results:
>
>	- Same Bandwidth issue
>	- Code Modification in misc.c does not seem to get hit.
>	  Introduced debug output is not present.
>	- Debug output introduced in readconf.c is displayed.  
>	
>
>[@gnpsott30ipcm2]/export/home/nortel:=> scp -v nortel@47.135.87.20:/tmp/testfile /tmp/testfile
>Executing: program /usr/local/bin/ssh host 47.135.87.20, user nortel, command scp -v -f /tmp/testfile
>OpenSSH_3.7.1p2, SSH protocols 1.5/2.0, OpenSSL 0.9.7f 22 Mar 2005
>debug1: DEBUG VERSION OF SCP - CREATED TODAY
>debug1: Reading configuration data /usr/local/etc/ssh_config
>debug1: Connecting to 47.135.87.20 [47.135.87.20] port 22.
>debug1: Connection established.
>debug1: identity file /export/home/nortel/.ssh/identity type -1
>debug1: identity file /export/home/nortel/.ssh/id_rsa type -1
>debug1: identity file /export/home/nortel/.ssh/id_dsa type -1
>debug1: Remote protocol version 1.99, remote software version OpenSSH_3.7.1p2
>debug1: match: OpenSSH_3.7.1p2 pat OpenSSH*
>debug1: Enabling compatibility mode for protocol 2.0
>debug1: Local version string SSH-2.0-OpenSSH_3.7.1p2
>debug1: SSH2_MSG_KEXINIT sent
>debug1: SSH2_MSG_KEXINIT received
>debug1: kex: server->client aes128-cbc hmac-md5 none
>debug1: kex: client->server aes128-cbc hmac-md5 none
>debug1: SSH2_MSG_KEX_DH_GEX_REQUEST sent
>debug1: expecting SSH2_MSG_KEX_DH_GEX_GROUP
>debug1: SSH2_MSG_KEX_DH_GEX_INIT sent
>debug1: expecting SSH2_MSG_KEX_DH_GEX_REPLY
>debug1: Host '47.135.87.20' is known and matches the RSA host key.
>debug1: Found key in /export/home/nortel/.ssh/known_hosts:1
>debug1: ssh_rsa_verify: signature correct
>debug1: SSH2_MSG_NEWKEYS sent
>debug1: expecting SSH2_MSG_NEWKEYS
>debug1: SSH2_MSG_NEWKEYS received
>debug1: SSH2_MSG_SERVICE_REQUEST sent
>debug1: SSH2_MSG_SERVICE_ACCEPT received
>debug1: Authentications that can continue: publickey,password,keyboard-interactive
>debug1: Next authentication method: publickey
>debug1: Trying private key: /export/home/nortel/.ssh/identity
>debug1: Trying private key: /export/home/nortel/.ssh/id_rsa
>debug1: Trying private key: /export/home/nortel/.ssh/id_dsa
>debug1: Next authentication method: keyboard-interactive
>debug1: Authentications that can continue: publickey,password,keyboard-interactive
>debug1: Next authentication method: password
>nortel@47.135.87.20's password:
>debug1: Authentication succeeded (password).
>debug1: channel 0: new [client-session]
>debug1: Entering interactive session.
>debug1: Sending command: scp -v -f /tmp/testfile
>Sending file modes: C0600 52428800 testfile
>testfile                                                                                    100%   50MB   1.3MB/s   00:34
>debug1: client_input_channel_req: channel 0 rtype exit-status reply 0
>debug1: channel 0: free: client-session, nchannels 1
>debug1: fd 0 clearing O_NONBLOCK
>debug1: fd 1 clearing O_NONBLOCK
>debug1: Transferred: stdin 0, stdout 0, stderr 0 bytes in 34.0 seconds
>debug1: Bytes per second: stdin 0.0, stdout 0.0, stderr 0.0
>debug1: Exit status 0
>[@gnpsott30ipcm2]/export/home/nortel:=> scp -v -1 nortel@47.135.87.20:/tmp/testfile /tmp/testfile
>Executing: program /usr/local/bin/ssh host 47.135.87.20, user nortel, command scp -v -f /tmp/testfile
>OpenSSH_3.7.1p2, SSH protocols 1.5/2.0, OpenSSL 0.9.7f 22 Mar 2005
>debug1: DEBUG VERSION OF SCP - CREATED TODAY
>debug1: Reading configuration data /usr/local/etc/ssh_config
>debug1: Connecting to 47.135.87.20 [47.135.87.20] port 22.
>debug1: Connection established.
>debug1: identity file /export/home/nortel/.ssh/identity type -1
>debug1: Remote protocol version 1.99, remote software version OpenSSH_3.7.1p2
>debug1: match: OpenSSH_3.7.1p2 pat OpenSSH*
>debug1: Local version string SSH-1.5-OpenSSH_3.7.1p2
>debug1: Waiting for server public key.
>debug1: Received server public key (768 bits) and host key (1024 bits).
>WARNING: RSA key found for host 47.135.87.20
>in /export/home/nortel/.ssh/known_hosts:1
>RSA key fingerprint 59:be:9e:d3:3d:da:59:a2:fc:65:5e:6a:63:e8:d0:e7.
>The authenticity of host '47.135.87.20 (47.135.87.20)' can't be established
>but keys of different type are already known for this host.
>RSA1 key fingerprint is 0c:eb:5e:df:7d:c6:16:d3:15:4e:9b:ff:d0:bd:7a:41.
>Are you sure you want to continue connecting (yes/no)? yes
>Warning: Permanently added '47.135.87.20' (RSA1) to the list of known hosts.
>debug1: Encryption type: 3des
>debug1: Sent encrypted session key.
>debug1: Installing crc compensation attack detector.
>debug1: Received encrypted confirmation.
>debug1: Doing challenge response authentication.
>debug1: No challenge.
>debug1: Doing password authentication.
>nortel@47.135.87.20's password:
>debug1: Sending command: scp -v -f /tmp/testfile
>debug1: Entering interactive session.
>Sending file modes: C0600 52428800 testfile
>testfile                                                                                    100%   50MB   4.3MB/s   00:10
>debug1: fd 1 clearing O_NONBLOCK
>debug1: Transferred: stdin 3, stdout 52428825, stderr 44 bytes in 10.7 seconds
>debug1: Bytes per second: stdin 0.3, stdout 4907851.4, stderr 4.1
>debug1: Exit status 0

Actions: View

Attachments on bug 1014: 874 | 884 | 1013