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
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -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);
}

+1 −1
Original line number Diff line number Diff line
@@ -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>
+1 −1
Original line number Diff line number Diff line
@@ -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>
+1 −1
Original line number Diff line number Diff line
@@ -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>
+1 −1
Original line number Diff line number Diff line
@@ -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>
Loading