Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Eclipse Projects
Eclipse Titan
titan.EclipsePlug-ins
Commits
a1652a89
Commit
a1652a89
authored
Nov 12, 2020
by
Arpad Lovassy
Committed by
Gerrit Code Review
Nov 12, 2020
Browse files
Merge "unix domain sockets can not be supported from Java."
parents
1b47b2fc
302cfbe8
Changes
1
Hide whitespace changes
Inline
Side-by-side
org.eclipse.titan.runtime/src/org/eclipse/titan/runtime/core/mctr/MainController.java
View file @
a1652a89
...
...
@@ -2250,6 +2250,9 @@ public class MainController {
send_error
(
channel
,
MessageFormat
.
format
(
"Malformed VERSION message was received: Transport type {0} "
+
" must be supported anyway."
,
transport_type_enum
.
TRANSPORT_INET_STREAM
.
toString
()));
}
if
(
hc
.
transport_supported
[
transport_type_enum
.
TRANSPORT_UNIX_STREAM
.
ordinal
()])
{
hc
.
transport_supported
[
transport_type_enum
.
TRANSPORT_UNIX_STREAM
.
ordinal
()]
=
false
;
}
hc
.
log_source
=
MessageFormat
.
format
(
"HC@{0}"
,
hc
.
hostname_local
);
hc
.
hc_state
=
hc_state_enum
.
HC_IDLE
;
...
...
@@ -5060,7 +5063,6 @@ public class MainController {
break
;
case
TRANSPORT_INET_STREAM:
case
TRANSPORT_UNIX_STREAM:
break
;
default
:
send_error
(
tc
.
socket
,
MessageFormat
.
format
(
"Message CONNECT_LISTEN_ACK for port connection "
...
...
@@ -5209,7 +5211,6 @@ public class MainController {
send_connect
(
components
.
get
(
conn
.
headComp
),
conn
.
headPort
,
conn
.
tailComp
,
null
,
conn
.
tailPort
,
conn
.
transport_type
,
null
,
null
);
conn
.
conn_state
=
conn_state_enum
.
CONN_CONNECTING
;
break
;
case
TRANSPORT_UNIX_STREAM:
case
TRANSPORT_INET_STREAM:
// conn->head will be the server side
if
(
conn
.
tailComp
!=
TitanComponent
.
MTC_COMPREF
&&
conn
.
tailComp
!=
conn
.
headComp
)
{
...
...
@@ -5319,9 +5320,6 @@ public class MainController {
}
final
Host
tailLoc
=
components
.
get
(
destinationComponent
).
comp_location
;
if
(
headLoc
.
equals
(
tailLoc
)
&&
headLoc
.
transport_supported
[
transport_type_enum
.
TRANSPORT_UNIX_STREAM
.
ordinal
()])
{
return
transport_type_enum
.
TRANSPORT_UNIX_STREAM
;
}
if
(
headLoc
.
transport_supported
[
transport_type_enum
.
TRANSPORT_INET_STREAM
.
ordinal
()]
&&
tailLoc
.
transport_supported
[
transport_type_enum
.
TRANSPORT_INET_STREAM
.
ordinal
()])
{
return
transport_type_enum
.
TRANSPORT_INET_STREAM
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment