mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-09-03 00:25:17 +03:00
7c90fa9e64
Mirror the packet-filter lifecycle: marker specs now live on the NIO (next to filters), ride in link_data from controller to compute on every NIO create/update, and are reapplied by _ubridge_apply_markers in add_ubridge_udp_connection (bridge creation / node restart) and update_ubridge_udp_connection (NIO update — following the preceding reset_packet_filters so markers survive filter changes). Changes: - NIO / NIOUDP: _markers property + asdict - schemas/compute/nios.py: UDPNIO.markers field - base_manager.create_nio: nio.markers from settings - PUT /nio routes (vpcs/qemu/docker): nio.markers update - base_node: _ubridge_apply_markers(bridge_name, nio) iterates nio.markers, computes pcap path, calls _ubridge_add_marker_filter + MarkerManager.register; called after _ubridge_apply_filters - controller udp_link: _get_node_markers + _markers_for_node (route by capture_node_id); markers in create() and update() link_data - /markers/start,stop endpoints: mirror spec onto nio.markers so the marker survives a subsequent node stop/start without a PUT - tests: add markers field to NIO data expectations This covers: - Node restart: NIO persists, add_ubridge_udp_connection re-applies - Filter update: reset wipes markers, _ubridge_apply_markers re-adds - Project reload: create() carries markers in link_data → create_nio - Immediate create: endpoint sets nio.markers immediately
86 lines
1.8 KiB
Python
86 lines
1.8 KiB
Python
#
|
|
# Copyright (C) 2013 GNS3 Technologies Inc.
|
|
#
|
|
# This program is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
"""
|
|
Interface for UDP NIOs.
|
|
"""
|
|
|
|
from .nio import NIO
|
|
|
|
|
|
class NIOUDP(NIO):
|
|
|
|
"""
|
|
UDP NIO.
|
|
|
|
:param lport: local port number
|
|
:param rhost: remote address/host
|
|
:param rport: remote port number
|
|
"""
|
|
|
|
def __init__(self, lport, rhost, rport):
|
|
|
|
super().__init__()
|
|
self._lport = lport
|
|
self._rhost = rhost
|
|
self._rport = rport
|
|
|
|
@property
|
|
def lport(self):
|
|
"""
|
|
Returns the local port
|
|
|
|
:returns: local port number
|
|
"""
|
|
|
|
return self._lport
|
|
|
|
@property
|
|
def rhost(self):
|
|
"""
|
|
Returns the remote host
|
|
|
|
:returns: remote address/host
|
|
"""
|
|
|
|
return self._rhost
|
|
|
|
@property
|
|
def rport(self):
|
|
"""
|
|
Returns the remote port
|
|
|
|
:returns: remote port number
|
|
"""
|
|
|
|
return self._rport
|
|
|
|
def __str__(self):
|
|
|
|
return "NIO UDP"
|
|
|
|
def asdict(self):
|
|
|
|
return {
|
|
"type": "nio_udp",
|
|
"lport": self._lport,
|
|
"rport": self._rport,
|
|
"rhost": self._rhost,
|
|
"suspend": self._suspended,
|
|
"filters": self._filters,
|
|
"markers": self._markers
|
|
}
|