Skip to content

Init #2

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
izeek182 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Init #2

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
5 changes: 5 additions & 0 deletions .vscode/extensions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"recommendations": [
"sumneko.lua"
]
}
14 changes: 9 additions & 5 deletions baseManager/lib/defs.lua → netServices/lib/defs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ if(_NetDefs ~= nil) then
waiting = 1,
overdue = 2
}
_NetDefs.remoteEnum = {
server = 0,
componant = 1,
display = 2,
terminal = 3
_NetDefs.serviceEnum = {
adp = 0,
dns = 1,
logger = 2
}
_NetDefs.portEnum = {
logger = 8008,
Expand All @@ -22,6 +21,11 @@ if(_NetDefs ~= nil) then
heartBeat = 25,
componantCmd = 30
}
_NetDefs.routingEnum = {
uuid = 420, --not IP
service = 10, -- Used for adp,dns,possibly others
hostName = 61 --Not implmented
}
_NetDefs.START = 0
_NetDefs.END = 420
end
0 baseManager/lib/logger.lua → netServices/lib/logger.lua
View file
Open in desktop
File renamed without changes.
23 changes: 12 additions & 11 deletions baseManager/lib/netCore.lua → netServices/lib/netCore.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
if(_Net == nil) then
require("defs.lua")
require("defs")

local comp = require("component")
local event = require("event")
local Logger = require("logger")

local modem = comp.modem

_NetVars = {
listeners = {},
pListeners = {}
pListeners = {},
localHosts = {},
DNSCache = {},
remoteHosts = {}
}

_Net = {
}


function _Net.listen(port,listener)
if(_NetVars.pListeners[port] == nil) then
if(_NetVars.listeners[port] == nil) then
Expand Down Expand Up @@ -44,14 +48,11 @@ if(_Net == nil) then
_Net.send(uuid,_NetDefs.portEnum.ping,_NetDefs.START)
end

local function onMessage(eventName, localAddress, remoteAddress, port, distance, ...)
if(_NetVars.pListeners[port] ~= nil) then
_NetVars.pListeners[port](localAddress, remoteAddress, port, distance, arg)
else
if(_NetVars.listeners[port]~= nil)then
_NetVars.listeners[port](localAddress, remoteAddress, port, distance, arg)
else
Logger:info("recived message on port:"..port.." but has no registered services on port");
---@diagnostic disable-next-line: unused-local
local function onMessage(eventName, localAddress, remoteAddress, port, distance,routingMode,finalDestination, ...)
if(routingMode == _NetDefs.routingEnum.hostName) then
if(_NetVars.localHosts[finalDestination]~nil) then

end
end
end
Expand Down