mirror of
https://github.com/Telecominfraproject/wlan-cloud-ucentralgw.git
synced 2025-11-03 04:07:50 +00:00
Compare commits
8 Commits
WIFI-14292
...
OLS-433-fi
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
26b9a96506 | ||
|
|
5ce8dae9ec | ||
|
|
7da135c1e5 | ||
|
|
50ee4ba5cb | ||
|
|
3a8109d7ad | ||
|
|
56232966ec | ||
|
|
1ecf98d712 | ||
|
|
f5b60ced61 |
@@ -1,5 +1,5 @@
|
|||||||
cmake_minimum_required(VERSION 3.13)
|
cmake_minimum_required(VERSION 3.13)
|
||||||
project(owgw VERSION 3.2.0)
|
project(owgw VERSION 3.2.1)
|
||||||
|
|
||||||
set(CMAKE_CXX_STANDARD 20)
|
set(CMAKE_CXX_STANDARD 20)
|
||||||
set(CMAKE_CXX_STANDARD_REQUIRED True)
|
set(CMAKE_CXX_STANDARD_REQUIRED True)
|
||||||
|
|||||||
@@ -376,18 +376,21 @@ static std::string DefaultAPSchema = R"foo(
|
|||||||
"properties": {
|
"properties": {
|
||||||
"port-mirror": {
|
"port-mirror": {
|
||||||
"description": "Enable mirror of traffic from multiple minotor ports to a single analysis port.",
|
"description": "Enable mirror of traffic from multiple minotor ports to a single analysis port.",
|
||||||
"type": "object",
|
"type": "array",
|
||||||
"properties": {
|
"items": {
|
||||||
"monitor-ports": {
|
"type": "object",
|
||||||
"description": "The list of ports that we want to mirror.",
|
"properties": {
|
||||||
"type": "array",
|
"monitor-ports": {
|
||||||
"items": {
|
"description": "The list of ports that we want to mirror.",
|
||||||
|
"type": "array",
|
||||||
|
"items": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"analysis-port": {
|
||||||
|
"description": "The port that mirror'ed packets should be sent to.",
|
||||||
"type": "string"
|
"type": "string"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"analysis-port": {
|
|
||||||
"description": "The port that mirror'ed packets should be sent to.",
|
|
||||||
"type": "string"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -4652,16 +4655,22 @@ static std::string DefaultSWITCHSchema = R"foo(
|
|||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"properties": {
|
||||||
"port-mirror": {
|
"port-mirror": {
|
||||||
"type": "object",
|
"description": "Enable mirror of traffic from multiple minotor ports to a single analysis port.",
|
||||||
"properties": {
|
"type": "array",
|
||||||
"monitor-ports": {
|
"items": {
|
||||||
"type": "array",
|
"type": "object",
|
||||||
"items": {
|
"properties": {
|
||||||
|
"monitor-ports": {
|
||||||
|
"description": "The list of ports that we want to mirror.",
|
||||||
|
"type": "array",
|
||||||
|
"items": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"analysis-port": {
|
||||||
|
"description": "The port that mirror'ed packets should be sent to.",
|
||||||
"type": "string"
|
"type": "string"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"analysis-port": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -644,8 +644,6 @@ namespace OpenWifi {
|
|||||||
uint64_t Size = FileContent.str().size();
|
uint64_t Size = FileContent.str().size();
|
||||||
|
|
||||||
Poco::Data::Session Sess = Pool_->get();
|
Poco::Data::Session Sess = Pool_->get();
|
||||||
Sess.begin();
|
|
||||||
Poco::Data::Statement Statement(Sess);
|
|
||||||
|
|
||||||
if (Size < FileUploader()->MaxSize()) {
|
if (Size < FileUploader()->MaxSize()) {
|
||||||
|
|
||||||
@@ -668,9 +666,10 @@ namespace OpenWifi {
|
|||||||
} else {
|
} else {
|
||||||
poco_warning(Logger(), fmt::format("File {} is too large.", UUID));
|
poco_warning(Logger(), fmt::format("File {} is too large.", UUID));
|
||||||
}
|
}
|
||||||
Sess.commit();
|
|
||||||
|
|
||||||
// update CommandList here to ensure that file us uploaded
|
// update CommandList here to ensure that file us uploaded
|
||||||
|
Sess.begin();
|
||||||
|
Poco::Data::Statement Statement(Sess);
|
||||||
std::string StatementStr;
|
std::string StatementStr;
|
||||||
StatementStr =
|
StatementStr =
|
||||||
"UPDATE CommandList SET WaitingForFile=?, AttachDate=?, AttachSize=? WHERE UUID=?";
|
"UPDATE CommandList SET WaitingForFile=?, AttachDate=?, AttachSize=? WHERE UUID=?";
|
||||||
@@ -825,4 +824,4 @@ namespace OpenWifi {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace OpenWifi
|
} // namespace OpenWifi
|
||||||
|
|||||||
Reference in New Issue
Block a user