Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch ftp-bug-eb0b15d598 Excluding Merge-Ins
This is equivalent to a diff from 2847321e30 to 6474b535bb
2014-02-21
| ||
21:05 | ftp - Merged fix for ticket [eb0b15d598]. Bumped ftp to version 2.4.13. check-in: 863ac2e0d8 user: andreask tags: trunk | |
20:53 | The WDC synchronizer seems to do the trick. Added to the other 4 state sequences using an active data connection. Bug should be fixed now. Closed-Leaf check-in: 6474b535bb user: andreask tags: ftp-bug-eb0b15d598 | |
2014-02-17
| ||
17:27 | Fix varname oops. check-in: e362c612fa user: andreask tags: ftp-bug-eb0b15d598 | |
2014-02-13
| ||
06:28 | tar - Ticket [2840180]. Fixed bad separation of name and prefix for long path names. Extended the testsuite. Bumped package to 0.10. check-in: 9cefaa3479 user: aku tags: trunk | |
2014-02-12
| ||
05:53 | Updated to release 1.16 check-in: e891598c4c user: aku tags: ftp-bug-eb0b15d598 | |
05:52 | Updated to release 1.16 check-in: 25c175ce82 user: aku tags: update-to-critcl3 | |
05:52 | Updated to release 1.16 Leaf check-in: d4fbc67d71 user: aku tags: ooutil-bug-3609183 | |
2014-02-11
| ||
19:04 | Tcllib 1.16 Release. check-in: 2847321e30 user: aku tags: trunk, release, tcllib-1-16 | |
18:58 | Updated PACKAGES file. Closed-Leaf check-in: 6430a704e6 user: aku tags: tcllib-1-16-rc | |
2014-02-04
| ||
22:03 | Ticket [6002105722]. struct, struct::list - Fixed scoping errors in 'filter' and 'split' commands. Bumped version to 1.8.3. Extended testsuite. Thanks to Adrian Medrano Calvo for report and fix (including tests). check-in: a5597ab71e user: andreask tags: trunk | |
Changes to modules/ftp/ftp.tcl.
︙ | ︙ | |||
114 115 116 117 118 119 120 121 122 123 124 125 126 127 | # Handle timeouts # # Arguments: # - # proc ::ftp::Timeout {s} { upvar ::ftp::ftp$s ftp after cancel $ftp(Wait) set ftp(state.control) 1 DisplayMsg "" "Timeout of control connection after $ftp(Timeout) sec.!" error Command $ftp(Command) timeout return | > > > | 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 | # Handle timeouts # # Arguments: # - # proc ::ftp::Timeout {s} { upvar ::ftp::ftp$s ftp variable VERBOSE if {$VERBOSE} { DisplayMsg $s Waiting|Timeout! } after cancel $ftp(Wait) set ftp(state.control) 1 DisplayMsg "" "Timeout of control connection after $ftp(Timeout) sec.!" error Command $ftp(Command) timeout return |
︙ | ︙ | |||
140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 | # # Arguments: # - # proc ::ftp::WaitOrTimeout {s} { upvar ::ftp::ftp$s ftp set retvar 1 if { ![string length $ftp(Command)] && [info exists ftp(state.control)] } { set ftp(Wait) [after [expr {$ftp(Timeout) * 1000}] [list [namespace current]::Timeout $s]] vwait ::ftp::ftp${s}(state.control) set retvar $ftp(state.control) } if {$ftp(Error) != ""} { set errmsg $ftp(Error) set ftp(Error) "" DisplayMsg $s $errmsg error } return $retvar } ############################################################################# # # WaitComplete -- # | > > > > > > | 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 | # # Arguments: # - # proc ::ftp::WaitOrTimeout {s} { upvar ::ftp::ftp$s ftp variable VERBOSE set retvar 1 if { ![string length $ftp(Command)] && [info exists ftp(state.control)] } { if {$VERBOSE} { DisplayMsg $s Waiting|$ftp(Timeout)|\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\# } set ftp(Wait) [after [expr {$ftp(Timeout) * 1000}] [list [namespace current]::Timeout $s]] vwait ::ftp::ftp${s}(state.control) set retvar $ftp(state.control) if {$VERBOSE} { DisplayMsg $s Waiting|Done|\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\# } } if {$ftp(Error) != ""} { set errmsg $ftp(Error) set ftp(Error) "" DisplayMsg $s $errmsg error } if {$VERBOSE} { DisplayMsg $s Waiting|OK|$retvar } return $retvar } ############################################################################# # # WaitComplete -- # |
︙ | ︙ | |||
231 232 233 234 235 236 237 238 239 240 241 242 243 244 | # the socket channel identifier. proc ::ftp::StateHandler {s {sock ""}} { upvar ::ftp::ftp$s ftp variable DEBUG variable VERBOSE # disable fileevent on control socket, enable it at the and of the state machine # fileevent $ftp(CtrlSock) readable {} # there is no socket (and no channel to get) if called from a procedure set rc " " set msgtext {} | > > | 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 | # the socket channel identifier. proc ::ftp::StateHandler {s {sock ""}} { upvar ::ftp::ftp$s ftp variable DEBUG variable VERBOSE if {$VERBOSE} { DisplayMsg $s StateHandler/$s/$sock/================================================ } # disable fileevent on control socket, enable it at the and of the state machine # fileevent $ftp(CtrlSock) readable {} # there is no socket (and no channel to get) if called from a procedure set rc " " set msgtext {} |
︙ | ︙ | |||
304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 | if {![string equal $ftp(State) "quit_sent"]} { set ftp(Error) "Service not available!" } CloseDataConn $s WaitComplete $s 0 Command $ftp(Command) terminated catch {unset ftp(State)} return } else { # Fix SF bug #466746: Incomplete line, do nothing. return } } if { $DEBUG } { | > > > | > | > > | 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 | if {![string equal $ftp(State) "quit_sent"]} { set ftp(Error) "Service not available!" } CloseDataConn $s WaitComplete $s 0 Command $ftp(Command) terminated catch {unset ftp(State)} if {$VERBOSE} { DisplayMsg $s EOF/Control } return } else { # Fix SF bug #466746: Incomplete line, do nothing. if {$VERBOSE} { DisplayMsg $s Incomplete/Line } return } } if { $DEBUG } { DisplayMsg $s "-> rc=\"$rc\" -> msgtext=\"$msgtext\" -> state=\"$ftp(State)\"" } # In asynchronous mode, should we move on to the next state? set nextState 0 # system status replay if { [string equal $rc "211"] } { if {$VERBOSE} { DisplayMsg $s Ignore/211 } return } # use only the first digit regexp -- "^\[0-9\]?" $rc rc if {$VERBOSE} { DisplayMsg $s StateBegin////////($ftp(State)) } switch -exact -- $ftp(State) { user { switch -exact -- $rc { 2 { PutsCtrlSock $s "USER $ftp(User)" set ftp(State) passwd Command $ftp(Command) user |
︙ | ︙ | |||
534 535 536 537 538 539 540 541 542 543 544 545 546 547 | } } } list_close { switch -exact -- $rc { 1 {} 2 { set nextState 1 if {[info exists ftp(NextState)] && ![llength $ftp(NextState)]} { Command $ftp(Command) list [ListPostProcess $ftp(List)] } else { set complete_with 1 } } | > > > > | 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 | } } } list_close { switch -exact -- $rc { 1 {} 2 { # Sync control sequencer to active data connection # before stepping out WaitDataConn $s set nextState 1 if {[info exists ftp(NextState)] && ![llength $ftp(NextState)]} { Command $ftp(Command) list [ListPostProcess $ftp(List)] } else { set complete_with 1 } } |
︙ | ︙ | |||
780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 | } } } put_close { switch -exact -- $rc { 1 { # Keep going return } 2 { set complete_with 1 set nextState 1 Command $ftp(Command) put $ftp(RemoteFilename) } default { DisplayMsg $s "rc = $rc msgtext = \"$msgtext\"" set errmsg "Error storing file \"$ftp(RemoteFilename)\" due to \"$msgtext\"" | > > > > > | 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 | } } } put_close { switch -exact -- $rc { 1 { # Keep going if {$VERBOSE} { DisplayMsg $s put_close/1--continue } return } 2 { # Sync control sequencer to active data connection # before stepping out WaitDataConn $s set complete_with 1 set nextState 1 Command $ftp(Command) put $ftp(RemoteFilename) } default { DisplayMsg $s "rc = $rc msgtext = \"$msgtext\"" set errmsg "Error storing file \"$ftp(RemoteFilename)\" due to \"$msgtext\"" |
︙ | ︙ | |||
852 853 854 855 856 857 858 859 860 861 862 863 864 865 | Command $ftp(Command) error $errmsg } } } append_close { switch -exact -- $rc { 2 { set complete_with 1 set nextState 1 Command $ftp(Command) append $ftp(RemoteFilename) } default { set errmsg "Error storing file \"$ftp(RemoteFilename)\"!" set complete_with 0 | > > > > | 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 | Command $ftp(Command) error $errmsg } } } append_close { switch -exact -- $rc { 2 { # Sync control sequencer to active data connection # before stepping out WaitDataConn $s set complete_with 1 set nextState 1 Command $ftp(Command) append $ftp(RemoteFilename) } default { set errmsg "Error storing file \"$ftp(RemoteFilename)\"!" set complete_with 0 |
︙ | ︙ | |||
938 939 940 941 942 943 944 945 946 947 948 949 950 951 | Command $ftp(Command) error $errmsg } } } reget_close { switch -exact -- $rc { 2 { set complete_with 1 set nextState 1 Command $ftp(Command) get $ftp(RemoteFilename):$ftp(From):$ftp(To) unset ftp(From) ftp(To) } default { set errmsg "Error retrieving file \"$ftp(RemoteFilename)\"!" | > > > > | 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 | Command $ftp(Command) error $errmsg } } } reget_close { switch -exact -- $rc { 2 { # Sync control sequencer to active data connection # before stepping out WaitDataConn $s set complete_with 1 set nextState 1 Command $ftp(Command) get $ftp(RemoteFilename):$ftp(From):$ftp(To) unset ftp(From) ftp(To) } default { set errmsg "Error retrieving file \"$ftp(RemoteFilename)\"!" |
︙ | ︙ | |||
1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 | Command $ftp(Command) error $errmsg } } } get_close { switch -exact -- $rc { 2 { set complete_with 1 set nextState 1 if {$ftp(inline)} { upvar #0 $ftp(get:varname) returnData set returnData $ftp(GetData) Command $ftp(Command) get $ftp(GetData) } else { | > > > > | 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 | Command $ftp(Command) error $errmsg } } } get_close { switch -exact -- $rc { 2 { # Sync control sequencer to active data connection # before stepping out WaitDataConn $s set complete_with 1 set nextState 1 if {$ftp(inline)} { upvar #0 $ftp(get:varname) returnData set returnData $ftp(GetData) Command $ftp(Command) get $ftp(GetData) } else { |
︙ | ︙ | |||
1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 | } } default { error "Unknown state \"$ftp(State)\"" } } # finish waiting if { [info exists complete_with] } { WaitComplete $s $complete_with } # display control channel message if { [info exists buffer] } { if { $VERBOSE } { foreach line [split $buffer \n] { DisplayMsg $s "C: $line" control | > > > > > > | 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 | } } default { error "Unknown state \"$ftp(State)\"" } } if {$VERBOSE} { DisplayMsg $s ////////StateDone } # finish waiting if { [info exists complete_with] } { if {$VERBOSE} { DisplayMsg $s WaitBegin////////($complete_with) } WaitComplete $s $complete_with if {$VERBOSE} { DisplayMsg $s ////////WaitDone } } # display control channel message if { [info exists buffer] } { if { $VERBOSE } { foreach line [split $buffer \n] { DisplayMsg $s "C: $line" control |
︙ | ︙ | |||
1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 | } # If operating asynchronously, commence next state if {$nextState && [info exists ftp(NextState)] && [llength $ftp(NextState)]} { # Pop the head of the NextState queue set ftp(State) [lindex $ftp(NextState) 0] set ftp(NextState) [lreplace $ftp(NextState) 0 0] StateHandler $s } # enable fileevent on control socket again #fileevent $ftp(CtrlSock) readable [list ::ftp::StateHandler $ftp(CtrlSock)] } ############################################################################# # # Type -- # # REPRESENTATION TYPE - Sets the file transfer type to ascii or binary. | > > > > | 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 | } # If operating asynchronously, commence next state if {$nextState && [info exists ftp(NextState)] && [llength $ftp(NextState)]} { # Pop the head of the NextState queue set ftp(State) [lindex $ftp(NextState) 0] set ftp(NextState) [lreplace $ftp(NextState) 0 0] if {$VERBOSE} { DisplayMsg $s Recurse/StateHandler } StateHandler $s } # enable fileevent on control socket again #fileevent $ftp(CtrlSock) readable [list ::ftp::StateHandler $ftp(CtrlSock)] if {$VERBOSE} { DisplayMsg $s ======/HandlerDone } return } ############################################################################# # # Type -- # # REPRESENTATION TYPE - Sets the file transfer type to ascii or binary. |
︙ | ︙ | |||
1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 | # Arguments: # dir - directory to list # # Returns: # sorted list of files or {} if listing fails proc ::ftp::NList {s { dir ""}} { upvar ::ftp::ftp$s ftp if { ![info exists ftp(State)] } { if { ![string is digit -strict $s] } { DisplayMsg $s "Bad connection name \"$s\"" error } else { DisplayMsg $s "Not connected!" error } return {} } set ftp(List) {} if { $dir == "" } { set ftp(Dir) "" } else { set ftp(Dir) " $dir" } # save current type and force ascii mode set old_type $ftp(Type) if { $ftp(Type) != "ascii" } { if {[string length $ftp(Command)]} { set ftp(NextState) [list nlist_$ftp(Mode) type_change list_last] set ftp(type:changeto) $old_type Type $s ascii return {} } Type $s ascii } set ftp(State) nlist_$ftp(Mode) StateHandler $s # wait for synchronization set rc [WaitOrTimeout $s] # restore old type if { [Type $s] != $old_type } { Type $s $old_type } unset ftp(Dir) if { $rc } { return [lsort [split [string trim $ftp(List) \n] \n]] } else { CloseDataConn $s return {} } } ############################################################################# # # List -- # # LIST - This command causes a list to be sent from the server | > > > > > > > > > > > > > > > > | 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 | # Arguments: # dir - directory to list # # Returns: # sorted list of files or {} if listing fails proc ::ftp::NList {s { dir ""}} { variable VERBOSE upvar ::ftp::ftp$s ftp if {$VERBOSE} { DisplayMsg $s NList($s)($dir)~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ } if { ![info exists ftp(State)] } { if { ![string is digit -strict $s] } { DisplayMsg $s "Bad connection name \"$s\"" error } else { DisplayMsg $s "Not connected!" error } return {} } set ftp(List) {} if { $dir == "" } { set ftp(Dir) "" } else { set ftp(Dir) " $dir" } # save current type and force ascii mode set old_type $ftp(Type) if { $ftp(Type) != "ascii" } { if {$VERBOSE} { DisplayMsg $s NList/ForceAscii } if {[string length $ftp(Command)]} { set ftp(NextState) [list nlist_$ftp(Mode) type_change list_last] set ftp(type:changeto) $old_type Type $s ascii return {} } Type $s ascii } set ftp(State) nlist_$ftp(Mode) if {$VERBOSE} { DisplayMsg $s NList/Process~~~~~~~~~~~~~~~~~~~ } StateHandler $s if {$VERBOSE} { DisplayMsg $s NList/Processed~~~~~~~~~~~~~~~~~ } # wait for synchronization set rc [WaitOrTimeout $s] # restore old type if {$VERBOSE} { DisplayMsg $s NList/RestoreType~~~~~~~~~~~~~~~~~~~~~ } if { [Type $s] != $old_type } { Type $s $old_type } unset ftp(Dir) if { $rc } { if {$VERBOSE} { DisplayMsg $s NList/ReturnData~~~~~~~~~~~~~~~~~~~~~~~ } return [lsort [split [string trim $ftp(List) \n] \n]] } else { if {$VERBOSE} { DisplayMsg $s NList/CDC~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ } CloseDataConn $s return {} } if {$VERBOSE} { DisplayMsg $s ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~NList/Done } } ############################################################################# # # List -- # # LIST - This command causes a list to be sent from the server |
︙ | ︙ | |||
2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 | # from the caller. Closing it is not our responsibility. if {[info exists ftp(get:channel)]} { catch {unset ftp(get:channel)} catch {unset ftp(DestCI)} } catch {after cancel $ftp(Wait)} catch {fileevent $ftp(DataSock) readable {}} catch {close $ftp(DataSock); unset ftp(DataSock)} catch {close $ftp(DestCI); unset ftp(DestCI)} catch {close $ftp(SourceCI); unset ftp(SourceCI)} catch {close $ftp(DummySock); unset ftp(DummySock)} return | > | 2817 2818 2819 2820 2821 2822 2823 2824 2825 2826 2827 2828 2829 2830 2831 | # from the caller. Closing it is not our responsibility. if {[info exists ftp(get:channel)]} { catch {unset ftp(get:channel)} catch {unset ftp(DestCI)} } catch { unset ftp(AC) } catch {after cancel $ftp(Wait)} catch {fileevent $ftp(DataSock) readable {}} catch {close $ftp(DataSock); unset ftp(DataSock)} catch {close $ftp(DestCI); unset ftp(DestCI)} catch {close $ftp(SourceCI); unset ftp(SourceCI)} catch {close $ftp(DummySock); unset ftp(DummySock)} return |
︙ | ︙ | |||
2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 | # addr - the address, in network address notation, # of the client's host, # port - the client's port number proc ::ftp::InitDataConn {s sock addr port} { upvar ::ftp::ftp$s ftp variable VERBOSE # If the new channel is accepted, the dummy channel will be closed catch {close $ftp(DummySock); unset ftp(DummySock)} set ftp(state.data) 0 | > > > > | 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 | # addr - the address, in network address notation, # of the client's host, # port - the client's port number proc ::ftp::InitDataConn {s sock addr port} { upvar ::ftp::ftp$s ftp variable VERBOSE if { $VERBOSE } { DisplayMsg $s "D: New Connection from $addr:$port" data } # If the new channel is accepted, the dummy channel will be closed catch {close $ftp(DummySock); unset ftp(DummySock)} set ftp(state.data) 0 |
︙ | ︙ | |||
2835 2836 2837 2838 2839 2840 2841 | } default { error "Unknown state \"$ftp(State)\"" } } if { $VERBOSE } { | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 | } default { error "Unknown state \"$ftp(State)\"" } } if { $VERBOSE } { DisplayMsg $s "D: ... Connection from $addr:$port ... initialized" data } # Marker for WaitDataConn set ftp(AC) 1 return } ############################################################################# # # WaitDataConn -- # Arguments: The ftp connection handle # Returns: None # # Synchronizes the control sequencer to the data connection (active # mode). This must be placed at the end of all state sequences, # i.e. the last state of each sequence, dealing with a data # connection. Without the sync the control sequencer may step to the # next command causing a very late-coming data connection to encounter # an unknown state, and failing to establish what to do. # # Sync is achieved through the state field AC, in cooperation with the # procedures OpenActiveConn and InitDataConn. # # Missing field => Not an active connection - Ignore # AC == 0 => OAC has run, IDC not - Wait for IDC, then cleanup # AC == 1 => OAC has run, IDC as well - No waiting, just cleanup. proc ::ftp::WaitDataConn {s} { variable VERBOSE upvar ::ftp::ftp$s ftp if {$VERBOSE} { DisplayMsg $s WDC|$s|Begin|@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ } # Passive connection, nothing to do if {![info exists ftp(AC)]} { if {$VERBOSE} { DisplayMsg $s WDC|$s|Passive|@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ } return } # InitDataConn has not run yet. Wait! if {!$ftp(AC)} { if {$VERBOSE} { DisplayMsg $s WDC|$s|Sync|@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ } vwait ::ftp::ftp${s}(AC) # assert ftp(AC) == 1 if {$VERBOSE} { DisplayMsg $s WDC|$s|Synced|@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ } } ; # else: Was run already if {$VERBOSE} { DisplayMsg $s WDC|$s|Cleanup|@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ } # InitDataConn has run, clean up and continue unset ftp(AC) return } ############################################################################# # # OpenActiveConn -- # |
︙ | ︙ | |||
2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 | set p [lindex [fconfigure $ftp(DummySock) -sockname] 2] if { $VERBOSE } { DisplayMsg $s "D: Port is $p" data } set ftp(DataPort) "[expr {$p / 256}],[expr {$p % 256}]" return 1 } ############################################################################# # # OpenPassiveConn -- # | > > | 2999 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 3014 | set p [lindex [fconfigure $ftp(DummySock) -sockname] 2] if { $VERBOSE } { DisplayMsg $s "D: Port is $p" data } set ftp(DataPort) "[expr {$p / 256}],[expr {$p % 256}]" # Marker for WaitDataConn set ftp(AC) 0 return 1 } ############################################################################# # # OpenPassiveConn -- # |
︙ | ︙ |