GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-14 17:35:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Substitution of host during ip resolve: correct handling of ipv6

Browse Source
This commit is contained in:
David Kocik 2021-12-02 16:31:19 +01:00
parent 71a9ded1c0
commit a840f8020f
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/slic3r/Utils/OctoPrint.cpp
View File

@ -35,9 +35,16 @@ std::string substitute_host(const std::string& orig_addr, const std::string sub_
// userinfo // userinfo
size_t at = orig_addr.find("@"); size_t at = orig_addr.find("@");
host_start = (at != std::string::npos && at > host_start ? at + 1 : host_start); host_start = (at != std::string::npos && at > host_start ? at + 1 : host_start);
// end of host, could be port, subpath (could be query or fragment?) // end of host, could be port(:), subpath(/) (could be query(?) or fragment(#)?)
size_t host_end = orig_addr.find_first_of(":/?#", host_start); // or it will be ']' if address is ipv6 )
host_end = (host_end == std::string::npos ? orig_addr.length() : host_end); size_t potencial_host_end = orig_addr.find_first_of(":/", host_start);
// if there are more ':' it must be ipv6
if (potencial_host_end != std::string::npos && orig_addr[potencial_host_end] == ':' && orig_addr.rfind(':') != potencial_host_end) {
size_t ipv6_end = orig_addr.find(']', host_start);
// DK: Uncomment and replace orig_addr.length() if we want to allow subpath after ipv6 without [] parentheses.
potencial_host_end = (ipv6_end != std::string::npos ? ipv6_end + 1 : orig_addr.length()); //orig_addr.find('/', host_start));
}
size_t host_end = (potencial_host_end != std::string::npos ? potencial_host_end : orig_addr.length());
// now host_start and host_end should mark where to put resolved addr // now host_start and host_end should mark where to put resolved addr
// check host_start. if its nonsense, lets just use original addr (or resolved addr?) // check host_start. if its nonsense, lets just use original addr (or resolved addr?)
if (host_start >= orig_addr.length()) { if (host_start >= orig_addr.length()) {