Multiples choses

OpenVPN/Otarcik202501.ovpn

@@ -0,0 +1,269 @@
+##############################################
+# Sample client-side OpenVPN 2.0 config file #
+# for connecting to multi-client server.     #
+#                                            #
+# This configuration can be used by multiple #
+# clients, however each client should have   #
+# its own cert and key files.                #
+#                                            #
+# On Windows, you might want to rename this  #
+# file so it has a .ovpn extension           #
+##############################################
+
+# Specify that we are a client and that we
+# will be pulling certain config file directives
+# from the server.
+client
+
+# Use the same setting as you are using on
+# the server.
+# On most systems, the VPN will not function
+# unless you partially or fully disable
+# the firewall for the TUN/TAP interface.
+;dev tap
+dev tun
+
+# Windows needs the TAP-Win32 adapter name
+# from the Network Connections panel
+# if you have more than one.  On XP SP2,
+# you may need to disable the firewall
+# for the TAP adapter.
+;dev-node MyTap
+
+# Are we connecting to a TCP or
+# UDP server?  Use the same setting as
+# on the server.
+;proto tcp
+proto udp
+
+# The hostname/IP and port of the server.
+# You can have multiple remote entries
+# to load balance between the servers.
+remote vpn.yultek.dev 1194
+;remote 138.197.151.172 1194
+;remote my-server-2 1194
+
+# Choose a random host from the remote
+# list for load-balancing.  Otherwise
+# try hosts in the order specified.
+;remote-random
+
+# Keep trying indefinitely to resolve the
+# host name of the OpenVPN server.  Very useful
+# on machines which are not permanently connected
+# to the internet such as laptops.
+resolv-retry infinite
+
+# Most clients don't need to bind to
+# a specific local port number.
+nobind
+
+# Downgrade privileges after initialization (non-Windows only)
+;user nobody
+;group nobody
+
+# Try to preserve some state across restarts.
+persist-key
+persist-tun
+
+# If you are connecting through an
+# HTTP proxy to reach the actual OpenVPN
+# server, put the proxy server/IP and
+# port number here.  See the man page
+# if your proxy server requires
+# authentication.
+;http-proxy-retry # retry on connection failures
+;http-proxy [proxy server] [proxy port #]
+
+# Wireless networks often produce a lot
+# of duplicate packets.  Set this flag
+# to silence duplicate packet warnings.
+;mute-replay-warnings
+
+# SSL/TLS parms.
+# See the server config file for more
+# description.  It's best to use
+# a separate .crt/.key file pair
+# for each client.  A single ca
+# file can be used for all clients.
+;ca ca.crt
+;cert client.crt
+;key client.key
+
+# Verify server certificate by checking that the
+# certificate has the correct key usage set.
+# This is an important precaution to protect against
+# a potential attack discussed here:
+#  http://openvpn.net/howto.html#mitm
+#
+# To use this feature, you will need to generate
+# your server certificates with the keyUsage set to
+#   digitalSignature, keyEncipherment
+# and the extendedKeyUsage to
+#   serverAuth
+# EasyRSA can do this for you.
+remote-cert-tls server
+
+# If a tls-auth key is used on the server
+# then every client must also have the key.
+;tls-auth ta.key 1
+
+# Select a cryptographic cipher.
+# If the cipher option is used on the server
+# then you must also specify it here.
+# Note that v2.4 client/server will automatically
+# negotiate AES-256-GCM in TLS mode.
+# See also the data-ciphers option in the manpage
+cipher AES-256-GCM
+auth SHA256
+
+# Enable compression on the VPN link.
+# Don't enable this unless it is also
+# enabled in the server config file.
+#comp-lzo
+
+# Set log file verbosity.
+verb 3
+
+# Silence repeating messages
+;mute 20
+
+key-direction 1
+
+
+; script-security 2
+; up /etc/openvpn/update-resolv-conf
+; down /etc/openvpn/update-resolv-conf
+
+
+; script-security 2
+; up /etc/openvpn/update-systemd-resolved
+; down /etc/openvpn/update-systemd-resolved
+; down-pre
+; dhcp-option DOMAIN-ROUTE .
+<ca>
+-----BEGIN CERTIFICATE-----
+MIIDRTCCAi2gAwIBAgIUXe37kz2yqgyL2xXfvaGRzlz7ywYwDQYJKoZIhvcNAQEL
+BQAwFDESMBAGA1UEAwwJSkZfc2VydmVyMB4XDTIzMDIyMDIyMDkyMVoXDTMzMDIx
+NzIyMDkyMVowFDESMBAGA1UEAwwJSkZfc2VydmVyMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAnLdVAj0W31TtWGxwdBeqsdIHyUdVAEG8bX+CcNZDP3M3
+R/gJOmenjqsqHYBe5gZcky1hkqWaD7l/LNmyzZDZ1lVEWpcAZqxbsUZKiHU30bxq
+84L5qtaAOpwTsumidq2hBqoDBMdBmh18e0QEW624mui7ckXTRRG3PA0ccXtXcTYU
+ntmhYtQ2oaPauSmfJZIUfZTfVZbB8FkCgu+zJtCx5hq46vIHm8KX0m1zLIeUtGsI
+hkly+5v52f3sEMlddyoZZkfjRddETk2co09q3oNaP1LYxN5G+TvZDhpdE+PrDsNT
+wO4uU2d9hVIP3T49heLieZ6KVxyp1FsDYzo0CNlIDwIDAQABo4GOMIGLMB0GA1Ud
+DgQWBBSKeJDl8FDnjHXkuMCh6OmbshqdMjBPBgNVHSMESDBGgBSKeJDl8FDnjHXk
+uMCh6OmbshqdMqEYpBYwFDESMBAGA1UEAwwJSkZfc2VydmVyghRd7fuTPbKqDIvb
+Fd+9oZHOXPvLBjAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0B
+AQsFAAOCAQEARIg2x4Tit/6ZydMlle6ku32t75OMCVQoe7fUkRjNe8pCkZjZXLy9
+QIRwoqW3FRT8+mQjctZk3NsyLStF8Rc/fFvpjGY/hiEQ/RV1K2/IZ9hcswp/LRzQ
+ElDwXhe4zlcDT10GjHYYx221SR+ijgicZcaXgb9f3uZKIrPgyb8qB4KCQS8gPtCV
+1VmPM5/svVCI93G+xT92XBHa47fgV5GEn7Snah2UgFol5h7/KX/Sa2q0pfBlzqmt
+CutfEbYcwSxkoLsEUIW8KMoEAIsO+KIsraS6EXlRdT82Ui+UZWVPZABlzifCl+AV
+LzBrLwt2OeoEI1h65EyzzE7gDsjrE3JR/Q==
+-----END CERTIFICATE-----
+</ca>
+<cert>
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            44:e3:12:88:c3:8e:16:32:f4:1e:bb:13:ca:4d:4c:8d
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN=JF_server
+        Validity
+            Not Before: Jan 18 20:53:00 2025 GMT
+            Not After : Apr 23 20:53:00 2027 GMT
+        Subject: CN=Otarcik202501
+        Subject Public Key Info:
+            Public Key Algorithm: id-ecPublicKey
+                Public-Key: (384 bit)
+                pub:
+                    04:40:90:47:89:d8:ec:72:20:95:c0:fb:8d:b7:10:
+                    fc:52:1d:9b:ad:c1:65:91:e4:45:d5:0f:02:b0:31:
+                    8e:55:b7:fa:31:9a:a6:5a:1f:e0:85:cd:e2:21:9d:
+                    3c:95:7f:ad:80:f2:d1:63:e7:41:7d:e4:87:97:7e:
+                    a4:d1:e7:d2:c9:3d:3b:66:9f:52:fe:11:72:d3:d7:
+                    de:b9:f7:41:d5:7b:32:2b:01:94:4c:71:cb:ff:65:
+                    76:67:3e:ae:1a:4e:4f
+                ASN1 OID: secp384r1
+                NIST CURVE: P-384
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            X509v3 Subject Key Identifier: 
+                27:9B:8A:B2:AB:54:28:C6:F2:23:81:99:3D:AB:D5:4C:25:8D:95:0B
+            X509v3 Authority Key Identifier: 
+                keyid:8A:78:90:E5:F0:50:E7:8C:75:E4:B8:C0:A1:E8:E9:9B:B2:1A:9D:32
+                DirName:/CN=JF_server
+                serial:5D:ED:FB:93:3D:B2:AA:0C:8B:DB:15:DF:BD:A1:91:CE:5C:FB:CB:06
+            X509v3 Extended Key Usage: 
+                TLS Web Client Authentication
+            X509v3 Key Usage: 
+                Digital Signature
+    Signature Algorithm: sha256WithRSAEncryption
+    Signature Value:
+        5a:57:76:c3:9d:0e:55:d1:61:1d:43:2b:21:7c:ec:59:c0:07:
+        bf:76:f1:e6:c4:1b:3d:19:82:b0:b2:02:74:4c:d5:f2:7c:ba:
+        33:f4:24:d8:68:6f:29:fe:85:f9:be:ee:90:42:04:c5:25:15:
+        78:7e:8f:86:ef:ea:4d:15:d1:a5:dc:29:a4:50:99:74:a4:74:
+        53:ee:3f:6c:c3:a9:b9:af:e0:a3:e2:33:6a:4a:aa:20:21:92:
+        bc:e5:57:86:5b:53:c7:68:b8:05:43:c8:10:d7:06:68:58:9f:
+        c4:2a:51:50:f5:dd:7c:ae:e4:80:59:5a:55:83:e4:88:58:be:
+        be:8d:68:fe:7a:7a:95:fe:7d:67:f6:03:d5:09:4d:3d:11:24:
+        6d:03:33:40:5e:65:a2:c6:77:28:a0:60:aa:ea:df:08:31:7f:
+        d8:1f:94:8a:4e:2c:80:bc:8f:70:40:d3:14:72:a9:cd:9c:1f:
+        ef:b4:5d:a9:e6:65:49:fb:f7:e2:b3:ea:ce:59:c3:45:7d:05:
+        ca:16:fc:2b:ff:d9:fc:2d:c9:75:36:d4:60:a3:b7:03:5b:92:
+        85:0a:3a:e1:50:8a:39:6b:d3:d5:4b:61:58:c6:2d:fe:96:b0:
+        9d:26:6b:6d:d7:20:af:91:47:27:1f:13:61:34:33:f7:8a:16:
+        bd:da:ee:44
+-----BEGIN CERTIFICATE-----
+MIICqTCCAZGgAwIBAgIQROMSiMOOFjL0HrsTyk1MjTANBgkqhkiG9w0BAQsFADAU
+MRIwEAYDVQQDDAlKRl9zZXJ2ZXIwHhcNMjUwMTE4MjA1MzAwWhcNMjcwNDIzMjA1
+MzAwWjAYMRYwFAYDVQQDDA1PdGFyY2lrMjAyNTAxMHYwEAYHKoZIzj0CAQYFK4EE
+ACIDYgAEQJBHidjsciCVwPuNtxD8Uh2brcFlkeRF1Q8CsDGOVbf6MZqmWh/ghc3i
+IZ08lX+tgPLRY+dBfeSHl36k0efSyT07Zp9S/hFy09feufdB1XsyKwGUTHHL/2V2
+Zz6uGk5Po4GgMIGdMAkGA1UdEwQCMAAwHQYDVR0OBBYEFCebirKrVCjG8iOBmT2r
+1UwljZULME8GA1UdIwRIMEaAFIp4kOXwUOeMdeS4wKHo6ZuyGp0yoRikFjAUMRIw
+EAYDVQQDDAlKRl9zZXJ2ZXKCFF3t+5M9sqoMi9sV372hkc5c+8sGMBMGA1UdJQQM
+MAoGCCsGAQUFBwMCMAsGA1UdDwQEAwIHgDANBgkqhkiG9w0BAQsFAAOCAQEAWld2
+w50OVdFhHUMrIXzsWcAHv3bx5sQbPRmCsLICdEzV8ny6M/Qk2GhvKf6F+b7ukEIE
+xSUVeH6Phu/qTRXRpdwppFCZdKR0U+4/bMOpua/go+IzakqqICGSvOVXhltTx2i4
+BUPIENcGaFifxCpRUPXdfK7kgFlaVYPkiFi+vo1o/np6lf59Z/YD1QlNPREkbQMz
+QF5losZ3KKBgqurfCDF/2B+Uik4sgLyPcEDTFHKpzZwf77RdqeZlSfv34rPqzlnD
+RX0Fyhb8K//Z/C3JdTbUYKO3A1uShQo64VCKOWvT1UthWMYt/pawnSZrbdcgr5FH
+Jx8TYTQz94oWvdruRA==
+-----END CERTIFICATE-----
+</cert>
+<key>
+-----BEGIN PRIVATE KEY-----
+MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDC8LQbo5bSQlLmcU79d
+P11+xVUSmhAUocIo6z7o2eJgwK259K9l4XgbCSifxOFA3+WhZANiAARAkEeJ2Oxy
+IJXA+423EPxSHZutwWWR5EXVDwKwMY5Vt/oxmqZaH+CFzeIhnTyVf62A8tFj50F9
+5IeXfqTR59LJPTtmn1L+EXLT196590HVezIrAZRMccv/ZXZnPq4aTk8=
+-----END PRIVATE KEY-----
+</key>
+<tls-crypt>
+#
+# 2048 bit OpenVPN static key
+#
+-----BEGIN OpenVPN Static key V1-----
+4c828cbf0e58f927758e9471c1b6f03b
+2e77b2c634bad76df0570dd8f47184d6
+3921e25c6e6cbe4af4b64aad89d12425
+a9fca69ae08802b5ed583632c26678b0
+cc28c481c3831d1b2204dc30cd466395
+ccb8cd82cd2259c956b510c9a56e842a
+8693c44dca462f0ab7be3856abe9bbe1
+95a6ffd3b0237225b9497c7a0df05ad8
+2f2e0a8bff97c927d2890906d0105947
+fa3430fc779583772382534fb880add6
+8d5592fa4ff384d3e96c560019b5835f
+095da9b2fb33dbfbc1ffce9560908271
+ee96e02ccecc9d51b9dda79a77704a1d
+4407d7c805e6950854fe232adee02a12
+b09af2d9bfe04868a9e2e942dc64eb81
+9e062ab9f781e52d263195a58db72ebe
+-----END OpenVPN Static key V1-----
+</tls-crypt>

OpenVPN/server.conf

@@ -139,8 +139,17 @@ ifconfig-pool-persist /var/log/openvpn/ipp.txt
 # to know to route the OpenVPN client
 # address pool (10.8.0.0/255.255.255.0)
 # back to the OpenVPN server.
+
+# Route le subnet de la station Otarcik 2023
 push "route 192.168.10.0 255.255.255.0"
+
+# Route le subnet de la statio Kayak
 push "route 192.168.11.0 255.255.255.0"
+
+#route le subnet de la station Otarcik 2025
+push "route 192.168.12.0 255.255.255.0"
+
+
 ;push "route 192.168.30.0 255.255.255.0"
 
 # To assign specific IP addresses to specific

Otarcik_CAN/Exec/Logs/SystemLog.txt

@@ -3702,3 +3702,45 @@ Démarrage du logiciel Otarcik CAN le 2024-07-18 à 06:27:00
 2024-07-18 06:27:00 Initialisation du dispositif [MasterCAN]
 2024-07-18 06:27:00 Démarrage d'un module CAN...
 2024-07-18 06:27:00 Impossible de trouver le module CAN sur le channel 1
+
+
+********************************************************************
+Démarrage du logiciel Otarcik CAN le 2024-09-02 à 17:20:41
+********************************************************************
+2024-09-02 17:20:41 Librairie Axiomtek chargée avec succès
+2024-09-02 17:20:41 Watchdog CPU arrêté
+2024-09-02 17:20:41 Chargement de la configuration système...
+2024-09-02 17:20:41 Configuration système chargée avec succès!
+2024-09-02 17:20:41 Initialisation du dispositif [MasterCAN]
+2024-09-02 17:20:41 Démarrage d'un module CAN...
+2024-09-02 17:20:41 Module PCAN trouvé à l'adresse 1 avec le handle 0x51
+2024-09-02 17:20:42 Initialisation d'un module PCAN.  Handle:0x51, Baudrate:284
+2024-09-02 17:20:42 Module PCAN USB initialisé avec succès
+2024-09-02 17:20:42 Chargement de la base de données D:/Main/Dev/YULTek/Otarcik_CAN/Exec/Config/PCtelemetrie20230822.dbc
+2024-09-02 17:20:42 Base de données chargée avec succès.  Flags: 0x0
+2024-09-02 17:20:42 Dispositif [MasterCAN] initialisé avec succès!
+
+
+********************************************************************
+Démarrage du logiciel Otarcik CAN le 2024-09-02 à 17:21:34
+********************************************************************
+2024-09-02 17:21:34 Chargement de la configuration système...
+2024-09-02 17:21:34 Configuration système chargée avec succès!
+2024-09-02 17:21:34 Initialisation du dispositif [MasterCAN]
+2024-09-02 17:21:34 Démarrage d'un module CAN...
+2024-09-02 17:21:34 Module PCAN trouvé à l'adresse 1 avec le handle 0x51
+2024-09-02 17:21:34 Initialisation d'un module PCAN.  Handle:0x51, Baudrate:284
+2024-09-02 17:21:34 Module PCAN USB initialisé avec succès
+2024-09-02 17:21:34 Chargement de la base de données D:/Main/Dev/YULTek/Otarcik_CAN/Exec/Config/PCtelemetrie20230822.dbc
+2024-09-02 17:21:34 Base de données chargée avec succès.  Flags: 0x0
+2024-09-02 17:21:34 Dispositif [MasterCAN] initialisé avec succès!
+
+
+********************************************************************
+Démarrage du logiciel Otarcik CAN le 2025-02-21 à 12:46:52
+********************************************************************
+2025-02-21 12:46:52 Chargement de la configuration système...
+2025-02-21 12:46:52 Configuration système chargée avec succès!
+2025-02-21 12:46:52 Initialisation du dispositif [MasterCAN]
+2025-02-21 12:46:52 Démarrage d'un module CAN...
+2025-02-21 12:46:52 Impossible de trouver le module CAN sur le channel 1

Otarcik_CAN/Sources/CloudLogging/MQTTClientWrapper.cpp

@@ -375,7 +375,7 @@ int CMQTTClientWrapper::SendNextQueueMessage()
     }
     CMQTTMessage *Msg = mMQTTMessagesQueue.takeFirst();
     mMQTTClient.publish(Msg->mMessageTopic,Msg->mMessagePayload.toLocal8Bit(),1,true);
-    QString LogMsg = QString("Envoi d'un message MQTT provenant du buffer.  Topic: %1  Payload: %2 FIFO Size: %3").arg(Msg->mMessageTopic).arg(Msg->mMessagePayload).arg(mMQTTMessagesQueue.size());
+    QString LogMsg = QString("Envoi d'un message MQTT provenant du buffer.  Topic: %1  Payload: %2 FIFO Size: %2").arg(Msg->mMessageTopic).arg(Msg->mMessagePayload).arg(mMQTTMessagesQueue.size());
     CGeneralMessagesLogDispatcher::instance()->AddLogMessage(LogMsg,"CMQTTClientWrapper",true,3);
 
     delete Msg; //free memory

Otarcik_CAN/Sources/GeneralMessagesLogDispatcher.cpp

@@ -58,7 +58,7 @@ int CGeneralMessagesLogDispatcher::Init(CSysLogger *SysLoggerPtr)
         QString temp;
         mSystemLogFile->write("\n\n");
         mSystemLogFile->write(QString("********************************************************************\n").toUtf8());
-        mSystemLogFile->write(QString("Démarrage du logiciel Otarcik CAN le %1 à %2\n").arg(QDateTime::currentDateTime().date().toString("yyyy-MM-dd")).arg(QDateTime::currentDateTime().time().toString("hh:mm:ss")).toUtf8());
+        mSystemLogFile->write(QString("Démarrage du logiciel Otarcik CAN version %3 le %1 à %2\n").arg(QDateTime::currentDateTime().date().toString("yyyy-MM-dd")).arg(QDateTime::currentDateTime().time().toString("hh:mm:ss")).arg(SOFTWARE_VERSION).toUtf8());
         mSystemLogFile->write(QString("********************************************************************\n").toUtf8());
     }
 

Otarcik_CAN/Sources/MainWindow.cpp

@@ -17,12 +17,13 @@
 #include "MainWindow.h"
 #include "ui_MainWindow.h"
 
+
 CMainWindow::CMainWindow(QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::CMainWindow)
 {
     ui->setupUi(this);
-    QMainWindow::statusBar()->showMessage("V1.06");
+    QMainWindow::statusBar()->showMessage(SOFTWARE_VERSION);
 
     mGeneralStatusPage = new CGeneralStatusPage(this);
     mMainWindowWidget = new QTabWidget(this);

Otarcik_CAN/Sources/defines.h

@@ -2,15 +2,16 @@
 #define DEFINES_H
 
 
+#define SOFTWARE_VERSION "1.07-DBG"
 
 #define GENERAL_MESSAGES_MAX_LOG_LINES 5000 //The number of lines of general status log we keep in the general status window (avoids fucking up because you know.... RAM)
 #define GENERAL_MESSAGES_SEND_TO_STDOUT //Comment this line to avoid printing log messages using qDebug.
 
 #define MQTT_CLIENT_RECONNECT_TIMEOUT 5000  //Time in ms between reconnect attemps to MQTT broker when connection is lost
-#define MQTT_CLIENT_MSG_QUEUE_FLUSH_TIMEOUT 500 //The delay in ms between the TX messages when flushing the msg queue after a server reconnection
+#define MQTT_CLIENT_MSG_QUEUE_FLUSH_TIMEOUT 50 //The delay in ms between the TX messages when flushing the msg queue after a server reconnection
 #define MQTT_CLIENT_MSG_QUEUE_SIZE 5000 //The maximum number of messages to be queued.  Older messages are lost when adding a new one in a full queue
 #define MQTT_TIMESTAMP_IN_PAYLOAD   //Defining this adds the local timestamp to each MQTT payloads.
-//#define MQTT_USE_TIMER_TO_FLUSH_QUEUE //Use a timer based transmission of MQTT msgs while emtpying the queue instead of the "MessageSent" event.
+#define MQTT_USE_TIMER_TO_FLUSH_QUEUE //Use a timer based transmission of MQTT msgs while emtpying the queue instead of the "MessageSent" event.
 
 #define USE_TOPIC_PREFIX
 #define FORCE_FLOAT_REPRESENTATION
@@ -20,7 +21,7 @@
 #undef ENABLE_CHIPSET_DRIVER
 //#define ENABLE_CHIPSET_DRIVER     //POUR ACTIVER LE DRIVER, IL FAUT INCLURE LA LIBRAIRIE AXIOMTEK DANS LE .PRO (pis oublie pas de faire clean / run qMake)...
 
-//#define ENABLE_DEVELOPMENT_DEBUG_TOOLS
+#define ENABLE_DEVELOPMENT_DEBUG_TOOLS
 
 enum eOtarcikGeneralReturns
 {

Otarcik_CAN/release/Logs/SystemLog.txt

@@ -5472,3 +5472,10 @@ Démarrage du logiciel Otarcik CAN le 2024-07-18 à 06:05:26
 2024-07-18 06:05:26 Watchdog CPU arrêté
 2024-07-18 06:05:26 Chargement de la configuration système...
 2024-07-18 06:05:26 Configuration système chargée avec succès!
+
+
+********************************************************************
+Démarrage du logiciel Otarcik CAN le 2024-09-02 à 17:44:21
+********************************************************************
+2024-09-02 17:44:21 Chargement de la configuration système...
+2024-09-02 17:44:21 Configuration système chargée avec succès!