feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

remote debugger: wrap IPv6 addresses of remote gdb in [] as per rfc2732.

Browse Source 
Change-Id: I590f7e8e7e45a45fc699732fdefbd5130a06d3e1
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Fawzi Mohamed
2012-02-22 19:17:30 +01:00
committed by hjk
parent 2d262bd3b7
commit 2eda632ab3
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/remotelinux/remotelinuxdebugsupport.cpp
View File

@@ -110,7 +110,10 @@ DebuggerStartParameters AbstractRemoteLinuxDebugSupport::startParameters(const R
params.startMode = AttachToRemoteServer; params.startMode = AttachToRemoteServer;
params.executable = runConfig->localExecutableFilePath(); params.executable = runConfig->localExecutableFilePath();
params.debuggerCommand = runConfig->gdbCmd(); params.debuggerCommand = runConfig->gdbCmd();
params.remoteChannel = devConf->sshParameters().host + QLatin1String(":-1"); QString host = devConf->sshParameters().host;
params.remoteChannel = host.contains(QLatin1Char(':'))
? QString::fromLatin1("[%1]:-1").arg(host)
: host + QLatin1String(":-1");
// TODO: This functionality should be inside the debugger. // TODO: This functionality should be inside the debugger.
const ProjectExplorer::Abi &abi = runConfig->target() const ProjectExplorer::Abi &abi = runConfig->target()

7
src/plugins/remotelinux/startgdbserverdialog.cpp
View File

@@ -359,7 +359,12 @@ void StartGdbServerDialog::reportOpenPort(int port)
return; return;
LinuxDeviceConfiguration::ConstPtr device = d->currentDevice(); LinuxDeviceConfiguration::ConstPtr device = d->currentDevice();
QString channel = QString("%1:%2").arg(device->sshParameters().host).arg(port); QString host = device->sshParameters().host;
QString channel;
if (host.contains(QLatin1Char(':')))
channel = QString::fromLatin1("[%1]:%2").arg(host).arg(port);
else
channel = QString::fromLatin1("%1:%2").arg(host).arg(port);
logMessage(tr("Server started on %1").arg(channel)); logMessage(tr("Server started on %1").arg(channel));
QMetaObject::invokeMethod(ob, "gdbServerStarted", Qt::QueuedConnection, QMetaObject::invokeMethod(ob, "gdbServerStarted", Qt::QueuedConnection,