Skip to content

Commit ebdb9b3

Browse files
instpeinstpe
committed
feat: add device discover request
Signed-off-by: wei <[email protected]>
1 parent cf32c2c commit ebdb9b3

File tree

19 files changed

+250
-59
lines changed

19 files changed

+250
-59
lines changed

‎mdtp-client/src/main/java/io/github/protocol/mdtp/client/MdtpClient.java‎

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
package io.github.protocol.mdtp.client;
22

3+
import io.github.protocol.mdtp.common.model.CDATHeader;
4+
import io.github.protocol.mdtp.common.model.DeviceDiscoveryRequest;
5+
import io.github.protocol.mdtp.common.model.MdtpPacket;
6+
import io.github.protocol.mdtp.common.model.MessageBodyHeader;
37
import io.netty.bootstrap.Bootstrap;
8+
import io.netty.buffer.Unpooled;
49
import io.netty.channel.ChannelFuture;
510
import io.netty.channel.ChannelInitializer;
611
import io.netty.channel.EventLoopGroup;
@@ -16,6 +21,8 @@
1621
public class MdtpClient implements Closeable {
1722
private final MdtpClientConfig config;
1823

24+
private ChannelFuture channelFuture;
25+
1926
private EventLoopGroup group;
2027

2128
public MdtpClient(MdtpClientConfig config) {
@@ -35,9 +42,13 @@ public void start() throws Exception {
3542
.handler(new ChannelInitializer<SocketChannel>() {
3643
@Override
3744
protected void initChannel(SocketChannel ch) throws Exception {
45+
// ChannelPipeline pipeline = ch.pipeline();
46+
// pipeline.addLast(new MdtpDecoder());
47+
// pipeline.addLast(new MdtpEncoder());
48+
// pipeline.addLast(new MdtpClientHandler());
3849
}
3950
});
40-
ChannelFuture channelFuture = bootstrap.connect().sync();
51+
this.channelFuture = bootstrap.connect().sync();
4152
if (channelFuture.isSuccess()) {
4253
log.info("mdtp client started");
4354
} else {
@@ -55,4 +66,40 @@ public void close() throws IOException {
5566
this.group.shutdownGracefully();
5667
log.info("mdtp client closed");
5768
}
69+
70+
public void sendDeviceDiscoveryRequest(int[] deviceTypes) {
71+
log.info("start to send device discovery request.");
72+
DeviceDiscoveryRequest request = new DeviceDiscoveryRequest();
73+
request.setMessageBodyHeader(MessageBodyHeader.DEVICE_DISCOVERY_REQUEST);
74+
log.info("" + request.getMessageBodyHeader().toShort());
75+
request.setRequestId(request.generateRequestId());
76+
77+
if (deviceTypes == null) {
78+
request.setDeviceTypeCount((byte) 0);
79+
}
80+
81+
if (deviceTypes != null && deviceTypes.length > 0) {
82+
request.setMask((byte) 1);
83+
request.setDeviceTypeCount((byte) deviceTypes.length);
84+
request.setDeviceTypes(deviceTypes);
85+
}
86+
87+
CDATHeader cdatHeader = new CDATHeader();
88+
cdatHeader.setFormatType((byte) 0x02);
89+
cdatHeader.setProtocolVersion((byte) 1);
90+
cdatHeader.setMessageLength((short) 0);
91+
cdatHeader.setTimestamp(System.currentTimeMillis());
92+
cdatHeader.setFlags((byte) 0b01100000);
93+
cdatHeader.setSequenceNumber(0);
94+
cdatHeader.setLogicalChannelId(0);
95+
96+
MdtpPacket packet = new MdtpPacket();
97+
packet.setHeader(cdatHeader);
98+
packet.setSecurityHeader(null);
99+
packet.setBody(request);
100+
packet.setSignature(null);
101+
102+
this.channelFuture.channel().writeAndFlush(packet.toByteBuf(Unpooled.buffer()));
103+
log.info("send device discovery request success: " + packet);
104+
}
58105
}

‎mdtp-common/src/main/java/io/github/protocol/mdtp/common/codec/DeviceDiscoveryRequestDecoder.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package io.github.protocol.mdtp.common.codec;
2+
3+
import io.github.protocol.mdtp.common.model.AbstractMessageBody;
4+
import io.github.protocol.mdtp.common.model.DeviceDiscoveryRequest;
5+
import io.github.protocol.mdtp.common.model.MdtpPacket;
6+
import io.netty.buffer.ByteBuf;
7+
8+
public class DeviceDiscoveryRequestDecoder implements MessageBodyDecoder {
9+
@Override
10+
public AbstractMessageBody handle(ByteBuf in) {
11+
return DeviceDiscoveryRequest.fromByteBuf(in);
12+
}
13+
}

‎mdtp-common/src/main/java/io/github/protocol/mdtp/common/codec/MdtpDecoder.java‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
package io.github.protocol.mdtp.common.codec;
2+
3+
4+
import io.github.protocol.mdtp.common.model.AbstractMessageBody;
5+
import io.github.protocol.mdtp.common.model.CDATHeader;
6+
import io.github.protocol.mdtp.common.model.MdtpPacket;
7+
import io.github.protocol.mdtp.common.model.MessageBodyHeader;
8+
import io.netty.buffer.ByteBuf;
9+
import io.netty.channel.ChannelHandlerContext;
10+
import io.netty.handler.codec.ByteToMessageDecoder;
11+
import lombok.extern.slf4j.Slf4j;
12+
13+
import java.util.List;
14+
15+
@Slf4j
16+
public class MdtpDecoder extends ByteToMessageDecoder {
17+
18+
@Override
19+
protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
20+
21+
MdtpPacket mdtpPacket = new MdtpPacket();
22+
CDATHeader header = CDATHeader.fromByteBuf(in);
23+
24+
MessageBodyHeader messageBodyHeader = MessageBodyHeader.fromByteBuf(in);
25+
MessageBodyDecoder messageDecode = MessageDecoderFactory.getDecoder(messageBodyHeader);
26+
AbstractMessageBody messageBody = messageDecode.handle(in);
27+
messageBody.setMessageBodyHeader(messageBodyHeader);
28+
29+
mdtpPacket.setHeader(header);
30+
mdtpPacket.setBody(messageBody);
31+
32+
out.add(mdtpPacket);
33+
}
34+
}

‎mdtp-common/src/main/java/io/github/protocol/mdtp/common/codec/MessageBodyDecoder.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package io.github.protocol.mdtp.common.codec;
2+
3+
import io.github.protocol.mdtp.common.model.AbstractMessageBody;
4+
import io.github.protocol.mdtp.common.model.MdtpPacket;
5+
import io.netty.buffer.ByteBuf;
6+
7+
public interface MessageBodyDecoder {
8+
AbstractMessageBody handle(ByteBuf in);
9+
}

‎mdtp-common/src/main/java/io/github/protocol/mdtp/common/codec/MessageDecoderFactory.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package io.github.protocol.mdtp.common.codec;
2+
3+
import io.github.protocol.mdtp.common.model.MessageBodyHeader;
4+
5+
import java.util.HashMap;
6+
import java.util.Map;
7+
8+
public class MessageDecoderFactory {
9+
10+
private static final Map<Short, MessageBodyDecoder> decoders = new HashMap<>();
11+
12+
static {
13+
decoders.put(MessageBodyHeader.DEVICE_DISCOVERY_REQUEST.toShort(), new DeviceDiscoveryRequestDecoder());
14+
}
15+
16+
public static MessageBodyDecoder getDecoder(MessageBodyHeader header) {
17+
return decoders.get(header.toShort());
18+
}
19+
}

‎mdtp-common/src/main/java/io/github/protocol/mdtp/common/model/AbstractMessageBody.java‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,15 @@
77

88
@Data
99
public abstract class AbstractMessageBody {
10-
private short messageBodyHeader;
11-
12-
public void setMessageBodyHeader(MessageType messageType, ServiceGroup serviceGroup, DiscoveryServiceCode serviceCode) {
13-
this.messageBodyHeader = 0;
14-
this.messageBodyHeader |= (short) (messageType.getCode() & 0b111);
15-
this.messageBodyHeader |= (short) ((serviceGroup.getCode() & 0b1111111) << 3);
16-
this.messageBodyHeader |= (short) ((serviceCode.getCode() & 0b111111) << 10);
17-
}
10+
private MessageBodyHeader messageBodyHeader;
1811

1912
public short generateRequestId() {
2013
UUID uuid = UUID.randomUUID();
2114
return (short) (uuid.getLeastSignificantBits() & 0xFFFF);
2215
}
2316

2417
public ByteBuf toByteBuf(ByteBuf buffer) {
25-
buffer.writeShort(messageBodyHeader);
18+
messageBodyHeader.toByteBuf(buffer);
2619
return buffer;
2720
}
2821
}

‎mdtp-common/src/main/java/io/github/protocol/mdtp/common/model/CDATHeader.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,18 @@ public ByteBuf toByteBuf(ByteBuf buffer) {
3535
buffer.writeInt(logicalChannelId);
3636
return buffer;
3737
}
38+
39+
public static CDATHeader fromByteBuf(ByteBuf buffer) {
40+
CDATHeader header = new CDATHeader();
41+
42+
header.setFormatType(buffer.readByte());
43+
header.setProtocolVersion(buffer.readByte());
44+
header.setMessageLength(buffer.readShort());
45+
header.setTimestamp(buffer.readLong());
46+
header.setFlags(buffer.readByte());
47+
header.setSequenceNumber(buffer.readInt());
48+
header.setLogicalChannelId(buffer.readInt());
49+
50+
return header;
51+
}
3852
}

‎mdtp-common/src/main/java/io/github/protocol/mdtp/common/model/DeviceDiscoveryRequest.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55

66

77
@Data
8-
public class DeviceDiscoveryRequest extends AbstractMessageBody {
8+
public class DeviceDiscoveryRequest extends AbstractMessageBody{
9+
910
private short requestId;
1011

1112
private byte mask;
@@ -19,8 +20,10 @@ public ByteBuf toByteBuf(ByteBuf buffer) {
1920
buffer.writeShort(requestId);
2021
buffer.writeByte(mask);
2122
buffer.writeByte(deviceTypeCount);
22-
for (int deviceType : deviceTypes) {
23-
buffer.writeInt(deviceType);
23+
if (deviceTypeCount > 0) {
24+
for (int deviceType : deviceTypes) {
25+
buffer.writeInt(deviceType);
26+
}
2427
}
2528
return buffer;
2629
}

‎mdtp-common/src/main/java/io/github/protocol/mdtp/common/model/DiscoveryServiceCode.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,12 @@ public enum DiscoveryServiceCode {
1616
this.description = description;
1717
}
1818

19+
public static DiscoveryServiceCode fromCode(int value) {
20+
for (DiscoveryServiceCode serviceCode : DiscoveryServiceCode.values()) {
21+
if (serviceCode.getCode() == value) {
22+
return serviceCode;
23+
}
24+
}
25+
throw new IllegalArgumentException("Invalid DiscoveryServiceCode: " + value);
26+
}
1927
}

‎mdtp-common/src/main/java/io/github/protocol/mdtp/common/model/MessageBodyHeader.java‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
package io.github.protocol.mdtp.common.model;
2+
3+
import io.netty.buffer.ByteBuf;
4+
import lombok.AllArgsConstructor;
5+
import lombok.Data;
6+
import lombok.NoArgsConstructor;
7+
import lombok.extern.slf4j.Slf4j;
8+
9+
import java.util.UUID;
10+
11+
@Data
12+
@AllArgsConstructor
13+
@NoArgsConstructor
14+
@Slf4j
15+
public class MessageBodyHeader {
16+
private MessageType messageType;
17+
18+
private ServiceGroup serviceGroup;
19+
20+
private DiscoveryServiceCode serviceCode;
21+
22+
public static final MessageBodyHeader DEVICE_DISCOVERY_REQUEST =
23+
new MessageBodyHeader(MessageType.REQUEST, ServiceGroup.DISCOVERY_SERVICE, DiscoveryServiceCode.DEVICE_DISCOVERY);
24+
25+
public static final MessageBodyHeader DEVICE_DISCOVERY_RESPONSE =
26+
new MessageBodyHeader(MessageType.RESPONSE, ServiceGroup.DISCOVERY_SERVICE, DiscoveryServiceCode.DEVICE_DISCOVERY);
27+
28+
public short toShort() {
29+
short messageBodyHeader = 0;
30+
messageBodyHeader |= (short) (this.messageType.getCode() & 0b111);
31+
messageBodyHeader |= (short) ((this.serviceGroup.getCode() & 0b1111111) << 3);
32+
messageBodyHeader |= (short) ((this.serviceCode.getCode() & 0b111111) << 10);
33+
return messageBodyHeader;
34+
}
35+
36+
public ByteBuf toByteBuf(ByteBuf buffer) {
37+
buffer.writeShort(toShort());
38+
return buffer;
39+
}
40+
41+
public static MessageBodyHeader fromByteBuf(ByteBuf buffer) {
42+
short messageBodyHeader = buffer.readShort();
43+
MessageType messageType = MessageType.fromCode((short) (messageBodyHeader & 0b111));
44+
ServiceGroup serviceGroup = ServiceGroup.fromCode((short) ((messageBodyHeader >> 3) & 0b1111111));
45+
DiscoveryServiceCode serviceCode = DiscoveryServiceCode.fromCode((short) ((messageBodyHeader >> 10) & 0b111111));
46+
return new MessageBodyHeader(messageType, serviceGroup, serviceCode);
47+
}
48+
}

0 commit comments

Comments
 (0)