diff options
author | dnobori <da.git@softether.co.jp> | 2019-07-07 15:25:52 +0300 |
---|---|---|
committer | dnobori <da.git@softether.co.jp> | 2019-07-07 15:25:52 +0300 |
commit | 55d1ac0402a2f9cc546566485ad07cb1f8321b5d (patch) | |
tree | 186053d28d88e53a05968d54d948a679940c7ff0 /src/Cedar/EtherLog.c | |
parent | 92837bc8b46e244f3101c1d6425c171997ce79b1 (diff) |
v4.30-9695-betav4.30-9695-beta
Diffstat (limited to 'src/Cedar/EtherLog.c')
-rw-r--r-- | src/Cedar/EtherLog.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Cedar/EtherLog.c b/src/Cedar/EtherLog.c index 36bf0932..ea290915 100644 --- a/src/Cedar/EtherLog.c +++ b/src/Cedar/EtherLog.c @@ -662,6 +662,7 @@ void OutRpcEnumDevice(PACK *p, RPC_ENUM_DEVICE *t) PackAddInt(p, "NumItem", t->NumItem);
+ PackSetCurrentJsonGroupName(p, "DeviceList");
for (i = 0;i < t->NumItem;i++)
{
RPC_ENUM_DEVICE_ITEM *d = &t->Items[i];
@@ -669,6 +670,7 @@ void OutRpcEnumDevice(PACK *p, RPC_ENUM_DEVICE *t) PackAddStrEx(p, "DeviceName", d->DeviceName, i, t->NumItem);
PackAddBoolEx(p, "Active", d->Active, i, t->NumItem);
}
+ PackSetCurrentJsonGroupName(p, NULL);
PackAddBool(p, "IsLicenseSupported", t->IsLicenseSupported);
}
@@ -709,7 +711,7 @@ void OutRpcElLicenseStatus(PACK *p, RPC_EL_LICENSE_STATUS *t) PackAddBool(p, "Valid", t->Valid);
PackAddInt64(p, "SystemId", t->SystemId);
- PackAddInt64(p, "SystemExpires", t->SystemExpires);
+ PackAddTime64(p, "SystemExpires", t->SystemExpires);
}
// Listener thread
|