resolve merge conflicts of ee5796f8c to oc-dev-plus-aosp (acfbf500) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/bnep/bnep_utils.cc

+61 −23

Original line number	Diff line number	Diff line
		@@ -712,26 +712,41 @@ void bnep_process_setup_conn_responce(tBNEP_CONN* p_bcb, uint8_t* p_setup) {
		uint8_t* bnep_process_control_packet(tBNEP_CONN* p_bcb, uint8_t* p,
		uint16_t* rem_len, bool is_ext) {
		uint8_t control_type;
		bool bad_pkt = false;
		uint16_t len, ext_len = 0;
		uint16_t rem_len_prev = *rem_len;

		if (p == NULL \|\| rem_len == NULL) {
		if (rem_len != NULL) *rem_len = 0;
		BNEP_TRACE_DEBUG("%s: invalid packet: p = %p rem_len = %p", __func__, p,
		rem_len);
		return NULL;
		}
		uint16_t rem_len_orig = *rem_len;

		if (is_ext) {
		if (*rem_len < 1) goto bad_packet_length;
		ext_len = *p++;
		rem_len = rem_len - 1;
		}

		if (*rem_len < 1) goto bad_packet_length;
		control_type = *p++;
		rem_len = rem_len - 1;

		BNEP_TRACE_EVENT(
		"BNEP processing control packet rem_len %d, is_ext %d, ctrl_type %d",
		*rem_len, is_ext, control_type);
		"%s: BNEP processing control packet rem_len %d, is_ext %d, ctrl_type %d",
		__func__, *rem_len, is_ext, control_type);

		switch (control_type) {
		case BNEP_CONTROL_COMMAND_NOT_UNDERSTOOD:
		BNEP_TRACE_ERROR("BNEP Received Cmd not understood for ctl pkt type: %d",
		*p);
		if (*rem_len < 1) {
		BNEP_TRACE_ERROR(
		"%s: Received BNEP_CONTROL_COMMAND_NOT_UNDERSTOOD with bad length",
		__func__);
		goto bad_packet_length;
		}
		BNEP_TRACE_ERROR(
		"%s: Received BNEP_CONTROL_COMMAND_NOT_UNDERSTOOD for pkt type: %d",
		__func__, *p);
		p++;
		rem_len = rem_len - 1;
		break;
		@@ -739,9 +754,10 @@ uint8_t* bnep_process_control_packet(tBNEP_CONN* p_bcb, uint8_t* p,
		case BNEP_SETUP_CONNECTION_REQUEST_MSG:
		len = *p++;
		if (rem_len < ((2 len) + 1)) {
		bad_pkt = true;
		BNEP_TRACE_ERROR("BNEP Received Setup message with bad length");
		break;
		BNEP_TRACE_ERROR(
		"%s: Received BNEP_SETUP_CONNECTION_REQUEST_MSG with bad length",
		__func__);
		goto bad_packet_length;
		}
		if (!is_ext) bnep_process_setup_conn_req(p_bcb, p, (uint8_t)len);
		p += (2 * len);
		@@ -749,6 +765,12 @@ uint8_t* bnep_process_control_packet(tBNEP_CONN* p_bcb, uint8_t* p,
		break;

		case BNEP_SETUP_CONNECTION_RESPONSE_MSG:
		if (*rem_len < 2) {
		BNEP_TRACE_ERROR(
		"%s: Received BNEP_SETUP_CONNECTION_RESPONSE_MSG with bad length",
		__func__);
		goto bad_packet_length;
		}
		if (!is_ext) bnep_process_setup_conn_responce(p_bcb, p);
		p += 2;
		rem_len = rem_len - 2;
		@@ -757,9 +779,10 @@ uint8_t* bnep_process_control_packet(tBNEP_CONN* p_bcb, uint8_t* p,
		case BNEP_FILTER_NET_TYPE_SET_MSG:
		BE_STREAM_TO_UINT16(len, p);
		if (*rem_len < (len + 2)) {
		bad_pkt = true;
		BNEP_TRACE_ERROR("BNEP Received Filter set message with bad length");
		break;
		BNEP_TRACE_ERROR(
		"%s: Received BNEP_FILTER_NET_TYPE_SET_MSG with bad length",
		__func__);
		goto bad_packet_length;
		}
		bnepu_process_peer_filter_set(p_bcb, p, len);
		p += len;
		@@ -767,6 +790,12 @@ uint8_t* bnep_process_control_packet(tBNEP_CONN* p_bcb, uint8_t* p,
		break;

		case BNEP_FILTER_NET_TYPE_RESPONSE_MSG:
		if (*rem_len < 2) {
		BNEP_TRACE_ERROR(
		"%s: Received BNEP_FILTER_NET_TYPE_RESPONSE_MSG with bad length",
		__func__);
		goto bad_packet_length;
		}
		bnepu_process_peer_filter_rsp(p_bcb, p);
		p += 2;
		rem_len = rem_len - 2;
		@@ -775,10 +804,10 @@ uint8_t* bnep_process_control_packet(tBNEP_CONN* p_bcb, uint8_t* p,
		case BNEP_FILTER_MULTI_ADDR_SET_MSG:
		BE_STREAM_TO_UINT16(len, p);
		if (*rem_len < (len + 2)) {
		bad_pkt = true;
		BNEP_TRACE_ERROR(
		"BNEP Received Multicast Filter Set message with bad length");
		break;
		"%s: Received BNEP_FILTER_MULTI_ADDR_SET_MSG with bad length",
		__func__);
		goto bad_packet_length;
		}
		bnepu_process_peer_multicast_filter_set(p_bcb, p, len);
		p += len;
		@@ -786,30 +815,39 @@ uint8_t* bnep_process_control_packet(tBNEP_CONN* p_bcb, uint8_t* p,
		break;

		case BNEP_FILTER_MULTI_ADDR_RESPONSE_MSG:
		if (*rem_len < 2) {
		BNEP_TRACE_ERROR(
		"%s: Received BNEP_FILTER_MULTI_ADDR_RESPONSE_MSG with bad length",
		__func__);
		goto bad_packet_length;
		}
		bnepu_process_multicast_filter_rsp(p_bcb, p);
		p += 2;
		rem_len = rem_len - 2;
		break;

		default:
		BNEP_TRACE_ERROR("BNEP - bad ctl pkt type: %d", control_type);
		BNEP_TRACE_ERROR("%s: BNEP - bad ctl pkt type: %d", __func__,
		control_type);
		bnep_send_command_not_understood(p_bcb, control_type);
		if (is_ext) {
		if (*rem_len < (ext_len - 1)) {
		goto bad_packet_length;
		}
		p += (ext_len - 1);
		*rem_len -= (ext_len - 1);
		}
		break;
		}
		return p;

		if (bad_pkt \|\| *rem_len > rem_len_prev) {
		BNEP_TRACE_ERROR("BNEP - bad ctl pkt length: %d", *rem_len);
		bad_packet_length:
		BNEP_TRACE_ERROR("%s: bad control packet length: original=%d remaining=%d",
		__func__, rem_len_orig, *rem_len);
		*rem_len = 0;
		return NULL;
		}

		return p;
		}

		/*******************************************************************************
		*
		* Function bnepu_process_peer_filter_set