Skip to content

Add support to access request with selection #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support to access request with selection #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 70 additions & 0 deletions development/src/main/java/gurux/dlms/GXDLMSAccessSelectionItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
//
// --------------------------------------------------------------------------
// Gurux Ltd
package gurux.dlms;

/**
* Access selection item is used access requests with selection.
*/
public class GXDLMSAccessSelectionItem {

/**
* Executed command type.
*/
private int command;

/**
* Target.
*/
private ValueEventArgs target;

/**
* @return target.
*/
public final ValueEventArgs getTarget() {
return target;
}

/**
* @param value
* Target.
*/
public final void setTarget(final ValueEventArgs value) {
target = value;
}

/**
* @return Executed command type.
*/
public final int getCommand() {
return command;
}

/**
* @param value
* Command type.
*/
public final void setCommand(final int value) {
command = value;
}

/**
* Constructor.
*/
public GXDLMSAccessSelectionItem() {
}

/**
* Constructor.
*
* @param commandType
* Command to execute.
* @param target
* Target.
*/
public GXDLMSAccessSelectionItem(final int commandType,
final ValueEventArgs target) {
command = commandType;
this.target = target;
}
}
93 changes: 57 additions & 36 deletions development/src/main/java/gurux/dlms/GXDLMSLNCommandHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,32 +255,7 @@ private static void getRequestNormal(final GXDLMSSettings settings, final short
&& attributeIndex == 1) {
GXDLMS.appendData(obj, attributeIndex, bb, new byte[] { 0, 0, 40, 0, 0, (byte) 255 });
} else {
if (obj instanceof GXDLMSProfileGeneric && attributeIndex == 2) {
DataType dt;
int rowsize = 0;
GXDLMSProfileGeneric pg = (GXDLMSProfileGeneric) e.getTarget();
// Count how many rows we can fit to one PDU.
for (Entry<GXDLMSObject, GXDLMSCaptureObject> it : pg.getCaptureObjects()) {
dt = it.getKey().getDataType(it.getValue().getAttributeIndex());
if (dt == DataType.OCTET_STRING) {
dt = it.getKey().getUIDataType(it.getValue().getAttributeIndex());
if (dt == DataType.DATETIME) {
rowsize += GXCommon.getDataTypeSize(DataType.DATETIME);
} else if (dt == DataType.DATE) {
rowsize += GXCommon.getDataTypeSize(DataType.DATE);
} else if (dt == DataType.TIME) {
rowsize += GXCommon.getDataTypeSize(DataType.TIME);
}
} else if (dt == DataType.NONE) {
rowsize += 2;
} else {
rowsize += GXCommon.getDataTypeSize(dt);
}
}
if (rowsize != 0) {
e.setRowToPdu(settings.getMaxPduSize() / rowsize);
}
}
verifyProfileGeneric(settings, e);
server.notifyRead(new ValueEventArgs[] { e });
Object value;
if (e.getHandled()) {
Expand Down Expand Up @@ -1092,12 +1067,12 @@ public static void handleAccessRequest(final GXDLMSSettings settings, final GXDL
xml.appendStartTag(TranslatorTags.ACCESS_REQUEST_BODY);
xml.appendStartTag(TranslatorTags.LIST_OF_ACCESS_REQUEST_SPECIFICATION, "Qty", xml.integerToHex(cnt, 2));
}
List<GXDLMSAccessItem> list = new ArrayList<GXDLMSAccessItem>();
List<GXDLMSAccessSelectionItem> list = new ArrayList<>();
byte type;
for (int pos = 0; pos != cnt; ++pos) {
type = (byte) data.getUInt8();
if (!(type == AccessServiceCommandType.GET || type == AccessServiceCommandType.SET
|| type == AccessServiceCommandType.ACTION)) {
if (!(type == AccessServiceCommandType.GET || type == AccessServiceCommandType.SET || type == AccessServiceCommandType.ACTION
|| type == AccessServiceCommandType.GET_WITH_SELECTION || type == AccessServiceCommandType.SET_WITH_SELECTION)) {
throw new IllegalArgumentException("Invalid access service command type.");
}
// CI
Expand All @@ -1106,6 +1081,13 @@ public static void handleAccessRequest(final GXDLMSSettings settings, final GXDL
data.get(ln);
// Attribute Id
short attributeIndex = data.getUInt8();
int selector = 0;
Object parameters = null;
if (type == AccessServiceCommandType.GET_WITH_SELECTION || type == AccessServiceCommandType.SET_WITH_SELECTION) {
GXDataInfo di = new GXDataInfo();
selector = data.getUInt8();
parameters = GXCommon.getData(settings, data, di);
}
if (xml != null) {
xml.appendStartTag(TranslatorTags.ACCESS_REQUEST_SPECIFICATION);
xml.appendStartTag(Command.ACCESS_REQUEST, type);
Expand All @@ -1122,7 +1104,8 @@ public static void handleAccessRequest(final GXDLMSSettings settings, final GXDL
obj = null;
}
}
list.add(new GXDLMSAccessItem(type, obj, attributeIndex));
ValueEventArgs e = new ValueEventArgs(settings, obj, attributeIndex, selector, parameters);
list.add(new GXDLMSAccessSelectionItem(type, e));
}
}
if (xml != null) {
Expand Down Expand Up @@ -1151,30 +1134,39 @@ public static void handleAccessRequest(final GXDLMSSettings settings, final GXDL
value = GXCommon.toHex((byte[]) value, false);
}
if (xml == null) {
GXDLMSAccessItem it = list.get(pos);
results.setUInt8(it.getCommand());
GXDLMSAccessSelectionItem it = list.get(pos);
if (it.getCommand() == AccessServiceCommandType.GET_WITH_SELECTION) {
results.setUInt8(AccessServiceCommandType.GET);
} else if (it.getCommand() == AccessServiceCommandType.SET_WITH_SELECTION) {
results.setUInt8(AccessServiceCommandType.SET);
} else {
results.setUInt8(it.getCommand());
}
if (it.getTarget() == null) {
// If target is unknown.
bb.setUInt8(0);
results.setUInt8(ErrorCode.UNAVAILABLE_OBJECT.getValue());
} else {
ValueEventArgs e = new ValueEventArgs(settings, it.getTarget(), it.getIndex(), 0, value);
ValueEventArgs e = it.getTarget();
settings.setIndex(0);
if (it.getCommand() == AccessServiceCommandType.GET) {
if (it.getCommand() == AccessServiceCommandType.GET
|| it.getCommand() == AccessServiceCommandType.GET_WITH_SELECTION) {
if ((server.notifyGetAttributeAccess(e) & AccessMode.READ.getValue()) == 0) {
// Read Write denied.
results.setUInt8(ErrorCode.READ_WRITE_DENIED.getValue());
} else {
verifyProfileGeneric(settings, e);
server.notifyRead(new ValueEventArgs[] { e });
if (e.getHandled()) {
value = e.getValue();
} else {
value = it.getTarget().getValue(settings, e);
settings.setCount(e.getRowEndIndex() - e.getRowBeginIndex());
value = e.getTarget().getValue(settings, e);
}
if (e.isByteArray()) {
bb.set((byte[]) value);
} else {
GXDLMS.appendData(it.getTarget(), it.getIndex(), bb, value);
GXDLMS.appendData(e.getTarget(), e.getIndex(), bb, value);
}
server.notifyPostRead(new ValueEventArgs[] { e });
results.setUInt8(ErrorCode.OK.getValue());
Expand Down Expand Up @@ -1267,4 +1259,33 @@ static void handleEventNotification(final GXDLMSSettings settings, final GXReply
}
}
}

private static void verifyProfileGeneric(final GXDLMSSettings settings, final ValueEventArgs e) {
if (e.getTarget() instanceof GXDLMSProfileGeneric && e.getIndex() == 2) {
DataType dt;
int rowsize = 0;
GXDLMSProfileGeneric pg = (GXDLMSProfileGeneric) e.getTarget();
// Count how many rows we can fit to one PDU.
for (Entry<GXDLMSObject, GXDLMSCaptureObject> it : pg.getCaptureObjects()) {
dt = it.getKey().getDataType(it.getValue().getAttributeIndex());
if (dt == DataType.OCTET_STRING) {
dt = it.getKey().getUIDataType(it.getValue().getAttributeIndex());
if (dt == DataType.DATETIME) {
rowsize += GXCommon.getDataTypeSize(DataType.DATETIME);
} else if (dt == DataType.DATE) {
rowsize += GXCommon.getDataTypeSize(DataType.DATE);
} else if (dt == DataType.TIME) {
rowsize += GXCommon.getDataTypeSize(DataType.TIME);
}
} else if (dt == DataType.NONE) {
rowsize += 2;
} else {
rowsize += GXCommon.getDataTypeSize(dt);
}
}
if (rowsize != 0) {
e.setRowToPdu(settings.getMaxPduSize() / rowsize);
}
}
}
}
8 changes: 8 additions & 0 deletions development/src/main/java/gurux/dlms/enums/AccessServiceCommandType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,12 @@ private AccessServiceCommandType() {
* Action request or response.
*/
public static final int ACTION = 3;
/**
* Get with selection request or response.
*/
public static final int GET_WITH_SELECTION = 4;
/**
* Set with selection request or response.
*/
public static final int SET_WITH_SELECTION = 5;
}