mirror of
				https://github.com/Telecominfraproject/wlan-cloud-ucentralgw.git
				synced 2025-11-04 04:37:46 +00:00 
			
		
		
		
	Compare commits
	
		
			19 Commits
		
	
	
		
			WIFI-14292
			...
			v3.2.1
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					38efea87ea | ||
| 
						 | 
					e90491c394 | ||
| 
						 | 
					735c4d715c | ||
| 
						 | 
					17082803d4 | ||
| 
						 | 
					26b9a96506 | ||
| 
						 | 
					5ce8dae9ec | ||
| 
						 | 
					7da135c1e5 | ||
| 
						 | 
					50ee4ba5cb | ||
| 
						 | 
					3a8109d7ad | ||
| 
						 | 
					56232966ec | ||
| 
						 | 
					1ecf98d712 | ||
| 
						 | 
					f5b60ced61 | ||
| 
						 | 
					5b703690b0 | ||
| 
						 | 
					f8302ba9e1 | ||
| 
						 | 
					62b99c2cb1 | ||
| 
						 | 
					5411b6b195 | ||
| 
						 | 
					5ed98b724a | ||
| 
						 | 
					68f5bb42ff | ||
| 
						 | 
					5867b6a1c0 | 
@@ -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)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -9,7 +9,7 @@ fullnameOverride: ""
 | 
				
			|||||||
images:
 | 
					images:
 | 
				
			||||||
  owgw:
 | 
					  owgw:
 | 
				
			||||||
    repository: tip-tip-wlan-cloud-ucentral.jfrog.io/owgw
 | 
					    repository: tip-tip-wlan-cloud-ucentral.jfrog.io/owgw
 | 
				
			||||||
    tag: master
 | 
					    tag: v3.2.1
 | 
				
			||||||
    pullPolicy: Always
 | 
					    pullPolicy: Always
 | 
				
			||||||
#    regcred:
 | 
					#    regcred:
 | 
				
			||||||
#      registry: tip-tip-wlan-cloud-ucentral.jfrog.io
 | 
					#      registry: tip-tip-wlan-cloud-ucentral.jfrog.io
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -376,6 +376,8 @@ 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": "array",
 | 
				
			||||||
 | 
					                    "items": {
 | 
				
			||||||
                        "type": "object",
 | 
					                        "type": "object",
 | 
				
			||||||
                        "properties": {
 | 
					                        "properties": {
 | 
				
			||||||
                            "monitor-ports": {
 | 
					                            "monitor-ports": {
 | 
				
			||||||
@@ -390,6 +392,7 @@ static std::string DefaultAPSchema = R"foo(
 | 
				
			|||||||
                                "type": "string"
 | 
					                                "type": "string"
 | 
				
			||||||
                            }
 | 
					                            }
 | 
				
			||||||
                        }
 | 
					                        }
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
                },
 | 
					                },
 | 
				
			||||||
                "loop-detection": {
 | 
					                "loop-detection": {
 | 
				
			||||||
                    "description": "Enable loop detection on the L2 switches/bridge.",
 | 
					                    "description": "Enable loop detection on the L2 switches/bridge.",
 | 
				
			||||||
@@ -4652,18 +4655,24 @@ static std::string DefaultSWITCHSchema = R"foo(
 | 
				
			|||||||
            "type": "object",
 | 
					            "type": "object",
 | 
				
			||||||
            "properties": {
 | 
					            "properties": {
 | 
				
			||||||
                "port-mirror": {
 | 
					                "port-mirror": {
 | 
				
			||||||
 | 
					                    "description": "Enable mirror of traffic from multiple minotor ports to a single analysis port.",
 | 
				
			||||||
 | 
					                    "type": "array",
 | 
				
			||||||
 | 
					                    "items": {
 | 
				
			||||||
                        "type": "object",
 | 
					                        "type": "object",
 | 
				
			||||||
                        "properties": {
 | 
					                        "properties": {
 | 
				
			||||||
                            "monitor-ports": {
 | 
					                            "monitor-ports": {
 | 
				
			||||||
 | 
					                                "description": "The list of ports that we want to mirror.",
 | 
				
			||||||
                                "type": "array",
 | 
					                                "type": "array",
 | 
				
			||||||
                                "items": {
 | 
					                                "items": {
 | 
				
			||||||
                                    "type": "string"
 | 
					                                    "type": "string"
 | 
				
			||||||
                                }
 | 
					                                }
 | 
				
			||||||
                            },
 | 
					                            },
 | 
				
			||||||
                            "analysis-port": {
 | 
					                            "analysis-port": {
 | 
				
			||||||
 | 
					                                "description": "The port that mirror'ed packets should be sent to.",
 | 
				
			||||||
                                "type": "string"
 | 
					                                "type": "string"
 | 
				
			||||||
                            }
 | 
					                            }
 | 
				
			||||||
                        }
 | 
					                        }
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
                },
 | 
					                },
 | 
				
			||||||
                "loop-detection": {
 | 
					                "loop-detection": {
 | 
				
			||||||
                    "type": "object",
 | 
					                    "type": "object",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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=?";
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user