| Summary: | Patch for disabling progress meter after file has finished uploading | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | Portable OpenSSH | Reporter: | gyroninja | ||||||||
| Component: | scp | Assignee: | Assigned to nobody <unassigned-bugs> | ||||||||
| Status: | CLOSED FIXED | ||||||||||
| Severity: | enhancement | CC: | djm | ||||||||
| Priority: | P5 | ||||||||||
| Version: | 7.6p1 | ||||||||||
| Hardware: | Other | ||||||||||
| OS: | Linux | ||||||||||
| Attachments: |
|
||||||||||
Created attachment 3059 [details]
patch that fixes issue
Comment on attachment 3059 [details] patch that fixes issue This bug report doesn't make any sense: version 7.6p1 isn't released yet and progressmeter.c doesn't contain the code you're modifying: >- if (cur_pos < end_pos) { >- signal(SIGALRM, update_progress_meter); >- alarm(UPDATE_INTERVAL); >- errno = save_errno; >- } >+ signal(SIGALRM, update_progress_meter); >+ alarm(UPDATE_INTERVAL); >+ errno = save_errno; The existing code already reads as after your patch is applied: 241 if (can_output()) 242 refresh_progress_meter(); 243 244 signal(SIGALRM, update_progress_meter); 245 alarm(UPDATE_INTERVAL); 246 errno = save_errno; Generally though, apparent "hangs" at 100% of the progress meter display are caused by buffering happening in the sending system ssh process, kernel socket buffers, the network or at the receiving side. Stopping the clock until the remote end has acknowledged receipt of the entire file is *correcting* the time and bandwidth calculations that are being distorted by the aforementioned buffering. Created attachment 3060 [details]
patch that fixes issue
Hi, sorry for making a few mistake. This is my first time contributing to the project. This change was originally for 7.4p1, but it didn't look like progressmeter.c had changed since then so I selected the latest version. It looks like I accidentally had my diff backwards. I have corrected the attachment with the diff in the right order. The diff is supposed to insert the if, because the progress bar should not update after it has finished transferring the whole file. I think these problems (and others) were fixed in the progressmeter.c changes that Darren committed before the OpenSSH 8.0 release. Please reopen the bug if this is not the case. closing resolved bugs as of 8.6p1 release |
Created attachment 3058 [details] patch that fixes issue Once the file has finished uploading the progress meter stops updating. Without this patch after the file has finished uploading the total time value is bigger than it should be. This time being wrong also causes your average upload rate to be incorrect since the timer is incrementing without any data being sent.