Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Force TCP v4 for socket to ScrollView server. Fixes #3000 #4162

Merged
merged 1 commit into from
Nov 11, 2023
Merged

Force TCP v4 for socket to ScrollView server. Fixes #3000 #4162

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions src/viewer/svutil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,15 +244,10 @@ static const char *ScrollViewProg() {

// The arguments to the program to invoke to start ScrollView
static std::string ScrollViewCommand(const std::string &scrollview_path) {
// The following ugly ifdef is to enable the output of the java runtime
// to be sent down a black hole on non-windows to ignore all the
// exceptions in piccolo. Ideally piccolo would be debugged to make
// this unnecessary.
// Also the path has to be separated by ; on windows and : otherwise.
// Quote our paths on Windows to deal with spaces
# ifdef _WIN32
const char cmd_template[] =
"-Djava.library.path=\"%s\" -jar \"%s/ScrollView.jar\"";

# else
const char cmd_template[] =
"-c \"trap 'kill %%1' 0 1 2 ; java "
Expand All @@ -279,6 +274,7 @@ SVNetwork::SVNetwork(const char *hostname, int port) {
buffer_ptr_ = nullptr;

struct addrinfo *addr_info = nullptr;
struct addrinfo hints = {0, PF_INET, SOCK_STREAM};
auto port_string = std::to_string(port);
# ifdef _WIN32
// Initialize Winsock
Expand All @@ -289,7 +285,7 @@ SVNetwork::SVNetwork(const char *hostname, int port) {
}
# endif // _WIN32

if (getaddrinfo(hostname, port_string.c_str(), nullptr, &addr_info) != 0) {
if (getaddrinfo(hostname, port_string.c_str(), &hints, &addr_info) != 0) {
std::cerr << "Error resolving name for ScrollView host "
<< std::string(hostname) << ":" << port << std::endl;
# ifdef _WIN32
Expand Down
Loading