Commit 974a7078 authored by Yann Garcia's avatar Yann Garcia
Browse files

Merge branch 'STF525' of https://forge.etsi.org/gitlab/ITS/ITS into STF525

parents 82a921b2 6c473c97
......@@ -21,6 +21,10 @@ tcp_layer::tcp_layer(const std::string & p_type, const std::string & param) : la
} else if (it->second.compare("1") == 0) {
set_socket_debugging(true);
}
it = _params.find(std::string("tcp_fragmented"));
if (it == _params.cend()) {
_params.insert(std::pair<std::string, std::string>(std::string("tcp_fragmented"), "0"));
}
bool server_mode = false;
it = _params.find(params::server_mode);
if (it != _params.cend()) {
......@@ -187,6 +191,9 @@ int tcp_layer::receive_message_on_fd(int p_client_id)
}
loggers::get_instance().log("tcp_layer::receive_message_on_fd: Non secured mode");
if (_params[std::string("tcp_fragmented")].compare("1") == 0) {
usleep(50000); // FIXME When HTTP paquet is fragmented into several TCP packets, a timer is required. This is a Q&D solution
}
return Abstract_Socket::receive_message_on_fd(p_client_id);
}
......
......@@ -20,7 +20,7 @@
</attribute>
<!-- its_aid_ssp_list -->
<attribute type="its_aid_ssp_list">
<ssp aid="CAM">01 FF FF</ssp> <!-- CAM -->
<ssp aid="CAM">01 FF FC</ssp> <!-- CAM -->
<ssp aid="DENM">01 FF FF FF</ssp> <!-- DENM -->
<ssp aid="GN-MGMT">00</ssp> <!-- GN-MGMT -->
</attribute>
......
......@@ -20,7 +20,7 @@
</attribute>
<!-- its_aid_ssp_list -->
<attribute type="its_aid_ssp_list">
<ssp aid="CAM">01 FF FF</ssp> <!-- CAM -->
<ssp aid="CAM">01 FF FC</ssp> <!-- CAM -->
<ssp aid="DENM">01 FF FF FF</ssp> <!-- DENM -->
<ssp aid="GN-MGMT">00</ssp> <!-- GN-MGMT -->
</attribute>
......
......@@ -20,7 +20,7 @@
</attribute>
<!-- its_aid_ssp_list -->
<attribute type="its_aid_ssp_list">
<ssp aid="CAM">01 FF FF</ssp> <!-- CAM -->
<ssp aid="CAM">01 FF FC</ssp> <!-- CAM -->
<!-- no DENM -->
<ssp aid="GN-MGMT">00</ssp> <!-- GN-MGMT -->
</attribute>
......
......@@ -21,7 +21,7 @@
</attribute>
<!-- its_aid_ssp_list -->
<attribute type="its_aid_ssp_list">
<ssp aid="CAM">01 FF FF</ssp> <!-- CAM -->
<ssp aid="CAM">01 FF FC</ssp> <!-- CAM -->
<ssp aid="DENM">01 FF FF FF</ssp> <!-- DENM -->
<ssp aid="GN-MGMT">00</ssp> <!-- GN-MGMT -->
</attribute>
......
......@@ -28,7 +28,7 @@
<ssp aid="100">00</ssp> <!-- not allocated -->
<ssp aid="101">00</ssp> <!-- not allocated -->
<ssp aid="102">00</ssp> <!-- not allocated -->
<ssp aid="CAM">01 FF FF</ssp> <!-- CAM -->
<ssp aid="CAM">01 FF FC</ssp> <!-- CAM -->
</attribute>
</subject>
<validity>
......
......@@ -20,7 +20,7 @@
</attribute>
<!-- its_aid_ssp_list -->
<attribute type="its_aid_ssp_list">
<ssp aid="CAM">01 FF FF</ssp> <!-- CAM -->
<ssp aid="CAM">01 FF FC</ssp> <!-- CAM -->
<ssp aid="DENM">01 FF FF FF</ssp> <!-- DENM -->
<ssp aid="GN-MGMT">00</ssp> <!-- GN-MGMT -->
</attribute>
......
......@@ -20,7 +20,7 @@
</attribute>
<!-- its_aid_ssp_list -->
<attribute type="its_aid_ssp_list">
<ssp aid="CAM">01 FF FF</ssp> <!-- CAM -->
<ssp aid="CAM">01 FF FC</ssp> <!-- CAM -->
<ssp aid="DENM">01 FF FF FF</ssp> <!-- DENM -->
<ssp aid="GN-MGMT">00</ssp> <!-- GN-MGMT -->
</attribute>
......
......@@ -20,7 +20,7 @@
</attribute>
<!-- its_aid_ssp_list -->
<attribute type="its_aid_ssp_list">
<ssp aid="CAM">01 FF FF</ssp> <!-- CAM -->
<ssp aid="CAM">01 FF FC</ssp> <!-- CAM -->
<ssp aid="DENM">01 FF FF FF</ssp> <!-- DENM -->
<ssp aid="GN-MGMT">00</ssp> <!-- GN-MGMT -->
</attribute>
......
......@@ -20,7 +20,7 @@
</attribute>
<!-- its_aid_ssp_list -->
<attribute type="its_aid_ssp_list">
<ssp aid="CAM">01 FF FF</ssp> <!-- CAM -->
<ssp aid="CAM">01 FF FC</ssp> <!-- CAM -->
<ssp aid="DENM">01 FF FF FF</ssp> <!-- DENM -->
<ssp aid="GN-MGMT">00</ssp> <!-- GN-MGMT -->
</attribute>
......
......@@ -20,7 +20,7 @@
</attribute>
<!-- its_aid_ssp_list -->
<attribute type="its_aid_ssp_list">
<ssp aid="CAM">01 FF FF</ssp> <!-- CAM -->
<ssp aid="CAM">01 FF FC</ssp> <!-- CAM -->
<ssp aid="DENM">01 FF FF FF</ssp> <!-- DENM -->
<ssp aid="GN-MGMT">00</ssp> <!-- GN-MGMT -->
</attribute>
......
......@@ -21,7 +21,7 @@
</attribute>
<!-- its_aid_ssp_list -->
<attribute type="its_aid_ssp_list">
<ssp aid="CAM">01 FF FF</ssp> <!-- CAM -->
<ssp aid="CAM">01 FF FC</ssp> <!-- CAM -->
<ssp aid="DENM">01 FF FF FF</ssp> <!-- DENM -->
<ssp aid="GN-MGMT">00</ssp> <!-- GN-MGMT -->
</attribute>
......
......@@ -28,6 +28,8 @@
<aid value="100"/> <!-- not allocated -->
<aid value="101"/> <!-- not allocated -->
<aid value="102"/> <!-- not allocated -->
</attribute>
<attribute type="its_aid_list" minChainLength="1">
<aid value="CRT-REQ">01 FE/FF 01</aid> <!-- Cert request: any -->
</attribute>
<attribute type="its_aid_ssp_list">
......
......@@ -20,7 +20,7 @@
</attribute>
<!-- its_aid_ssp_list -->
<attribute type="its_aid_ssp_list">
<ssp aid="CAM">01 FF FF</ssp> <!-- CAM -->
<ssp aid="CAM">01 FF FC</ssp> <!-- CAM -->
<ssp aid="DENM">01 FF FF FF</ssp> <!-- DENM -->
<ssp aid="GN-MGMT">00</ssp> <!-- GN-MGMT -->
</attribute>
......
......@@ -20,7 +20,7 @@
</attribute>
<!-- its_aid_ssp_list -->
<attribute type="its_aid_ssp_list">
<ssp aid="CAM">01 FF FF</ssp> <!-- CAM -->
<ssp aid="CAM">01 FF FC</ssp> <!-- CAM -->
<ssp aid="DENM">01 FF FF FF</ssp> <!-- DENM -->
<ssp aid="GN-MGMT">00</ssp> <!-- GN-MGMT -->
</attribute>
......
......@@ -20,7 +20,7 @@
</attribute>
<!-- its_aid_ssp_list -->
<attribute type="its_aid_ssp_list">
<ssp aid="CAM">01 FF FF</ssp> <!-- CAM -->
<ssp aid="CAM">01 FF FC</ssp> <!-- CAM -->
<ssp aid="DENM">01 FF FF FF</ssp> <!-- DENM -->
<ssp aid="GN-MGMT">00</ssp> <!-- GN-MGMT -->
</attribute>
......
......@@ -20,7 +20,7 @@
</attribute>
<!-- its_aid_ssp_list -->
<attribute type="its_aid_ssp_list">
<ssp aid="CAM">01 FF FF</ssp> <!-- CAM -->
<ssp aid="CAM">01 FF FC</ssp> <!-- CAM -->
<ssp aid="DENM">01 FF FF FF</ssp> <!-- DENM -->
<ssp aid="GN-MGMT">00</ssp> <!-- GN-MGMT -->
</attribute>
......
......@@ -20,7 +20,7 @@
</attribute>
<!-- its_aid_ssp_list -->
<attribute type="its_aid_ssp_list">
<ssp aid="CAM">01 FF FF</ssp> <!-- CAM -->
<ssp aid="CAM">01 FF FC</ssp> <!-- CAM -->
<ssp aid="DENM">01 FF FF FF</ssp> <!-- DENM -->
<ssp aid="GN-MGMT">00</ssp> <!-- GN-MGMT -->
</attribute>
......
......@@ -17,7 +17,7 @@
</attribute>
<!-- its_aid_ssp_list -->
<attribute type="its_aid_ssp_list">
<ssp aid="CAM">01 FF FF</ssp> <!-- Keep CAM permission for compatibility -->
<ssp aid="CAM">01 FF FC</ssp> <!-- Keep CAM permission for compatibility -->
<ssp aid="DENM">01 7F FF FF</ssp> <!-- DENM: no trafficCondition -->
</attribute>
</subject>
......
......@@ -17,7 +17,7 @@
</attribute>
<!-- its_aid_ssp_list -->
<attribute type="its_aid_ssp_list">
<ssp aid="CAM">01 FF FF</ssp> <!-- Keep CAM permission for compatibility -->
<ssp aid="CAM">01 FF FC</ssp> <!-- Keep CAM permission for compatibility -->
<ssp aid="DENM">01 BF FF FF</ssp> <!-- DENM: no accident -->
</attribute>
</subject>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment