1
0
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git synced 2025-12-13 05:53:06 +01:00

#79: add udp writer

This commit is contained in:
andreas
2024-11-04 20:21:33 +01:00
parent d0dee367f8
commit 490a5b9ba1
6 changed files with 156 additions and 0 deletions

View File

@@ -95,6 +95,7 @@ class GwApi{
unsigned long ser2Tx=0;
unsigned long tcpSerRx=0;
unsigned long tcpSerTx=0;
unsigned long udpwTx=0;
int tcpClients=0;
unsigned long tcpClRx=0;
unsigned long tcpClTx=0;

View File

@@ -6,6 +6,7 @@
#include "GwSocketServer.h"
#include "GwSerial.h"
#include "GwTcpClient.h"
#include "GwUdpWriter.h"
class SerInit{
public:
int serial=-1;
@@ -241,6 +242,24 @@ static ChannelParam channelParameters[]={
.maxId=-1,
.rxstatus=offsetof(GwApi::Status,GwApi::Status::tcpClRx),
.txstatus=offsetof(GwApi::Status,GwApi::Status::tcpClTx)
},
{
.id=UDPW_CHANNEL_ID,
.baud="",
.receive="",
.send=GwConfigDefinitions::udpwEnabled,
.direction="",
.toN2K="",
.readF="",
.writeF=GwConfigDefinitions::udpwWriteFilter,
.preventLog="",
.readAct="",
.writeAct="",
.sendSeasmart=GwConfigDefinitions::udpwSeasmart,
.name="UDPWriter",
.maxId=-1,
.rxstatus=0,
.txstatus=offsetof(GwApi::Status,GwApi::Status::udpwTx)
}
};
@@ -425,6 +444,13 @@ void GwChannelList::begin(bool fallbackSerial){
);
}
addChannel(createChannel(logger,config,TCP_CLIENT_CHANNEL_ID,client));
//udp writer
if (config->getBool(GwConfigDefinitions::udpwEnabled)){
GwUdpWriter *writer=new GwUdpWriter(config,logger,UDPW_CHANNEL_ID);
writer->begin();
addChannel(createChannel(logger,config,UDPW_CHANNEL_ID,writer));
}
logger->flush();
}
String GwChannelList::getMode(int id){

View File

@@ -18,6 +18,7 @@
#define SERIAL2_CHANNEL_ID 3
#define TCP_CLIENT_CHANNEL_ID 4
#define MIN_TCP_CHANNEL_ID 5
#define UDPW_CHANNEL_ID 20
#define MIN_USER_TASK 200
class GwSocketServer;

View File

@@ -0,0 +1,59 @@
#include "GwUdpWriter.h"
#include <ESPmDNS.h>
#include <errno.h>
#include "GwBuffer.h"
#include "GwSocketConnection.h"
#include "GwSocketHelper.h"
GwUdpWriter::GwUdpWriter(const GwConfigHandler *config, GwLog *logger, int minId)
{
this->config = config;
this->logger = logger;
this->minId = minId;
}
void GwUdpWriter::begin()
{
fd=socket(AF_INET,SOCK_DGRAM,IPPROTO_IP);
if (fd < 0){
LOG_ERROR("unable to create udp socket");
return;
}
int enable = 1;
setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(int));
setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &enable, sizeof(int));
port=config->getInt(GwConfigDefinitions::udpwPort);
//TODO: check port
address=config->getString(GwConfigDefinitions::udpwAddress);
LOG_INFO("UDP writer created, address=%s, port=%d",
address.c_str(),port);
inet_pton(AF_INET, address.c_str(), &destination.sin_addr);
destination.sin_family = AF_INET;
destination.sin_port = htons(port);
}
void GwUdpWriter::loop(bool handleRead, bool handleWrite)
{
}
void GwUdpWriter::readMessages(GwMessageFetcher *writer)
{
}
size_t GwUdpWriter::sendToClients(const char *buf, int source,bool partial)
{
if (source == minId) return 0;
size_t len=strlen(buf);
ssize_t err = sendto(fd,buf,len,0,(struct sockaddr *)&destination, sizeof(destination));
if (err < 0){
LOG_DEBUG(GwLog::DEBUG,"UDP writer error sending: %d",errno);
return 0;
}
return err;
}
GwUdpWriter::~GwUdpWriter()
{
}

View File

@@ -0,0 +1,28 @@
#ifndef _GWUDPWRITER_H
#define _GWUDPWRITER_H
#include "GWConfig.h"
#include "GwLog.h"
#include "GwBuffer.h"
#include "GwChannelInterface.h"
#include <memory>
#include <sys/socket.h>
#include <arpa/inet.h>
class GwUdpWriter: public GwChannelInterface{
private:
const GwConfigHandler *config;
GwLog *logger;
int fd=-1;
int minId;
int port;
String address;
struct sockaddr_in destination;
public:
GwUdpWriter(const GwConfigHandler *config,GwLog *logger,int minId);
~GwUdpWriter();
void begin();
virtual void loop(bool handleRead=true,bool handleWrite=true);
virtual size_t sendToClients(const char *buf,int sourceId, bool partialWrite=false);
virtual void readMessages(GwMessageFetcher *writer);
};
#endif