From 1188a7b20e2c1d4eca02fcccdb549887676c16ce Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Tue, 29 Jul 2025 20:14:45 +0200
Subject: [PATCH] Upgraded Net_Routeros to dev version

---
 composer.json                          |  2 +-
 lib/mvcfronk/mfRouteros/mfRouteros.php | 34 +++++++++++++++-----------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/composer.json b/composer.json
index 1a651c09a..32e59f052 100644
--- a/composer.json
+++ b/composer.json
@@ -9,6 +9,6 @@
         "phpseclib/phpseclib": "^3.0",
         "stomp-php/stomp-php": "^5",
         "phpmailer/phpmailer": "^6.9",
-        "pear2/net_routeros": "*@beta"
+        "pear2/net_routeros": "dev-develop@dev"
     }
 }
diff --git a/lib/mvcfronk/mfRouteros/mfRouteros.php b/lib/mvcfronk/mfRouteros/mfRouteros.php
index 1c7711fe5..2f2821160 100644
--- a/lib/mvcfronk/mfRouteros/mfRouteros.php
+++ b/lib/mvcfronk/mfRouteros/mfRouteros.php
@@ -1,31 +1,37 @@
 <?php
 
 use PEAR2\Net\RouterOS;
+use PEAR2\Net\Transmitter\NetworkStream;
+
 require __DIR__."/mfRouteros_Item.php";
 
-class mfRouteros extends mfBaseModel {
-  
+class mfRouteros {
+
   private $hostname;
+  private $port;
+  private $use_ssl;
   private $username;
   private $password;
   private $ros = false;
   
-  protected function init() {
-    if(defined("MFROS_HOSTNAME")) {
-      $this->hostname(MFROS_HOSTNAME);
-    }
-    if(defined("MFROS_USERNAME")) {
-      $this->username(MFROS_USERNAME);
-    }
-    if(defined("MFROS_PASSWORD")) {
-      $this->password(MFROS_PASSWORD);
-    }
+  public function __construct($hostname, $username, $password, $port = 8729, $use_ssl = true) {
+      $this->hostname = $hostname;
+      $this->username = $username;
+      $this->password = $password;
+
+      $this->port = $port;
+      $this->use_ssl = $use_ssl;
   }
   
   private function _connect() {
-    $this->ros = new RouterOS\Client($this->hostname,$this->username,$this->password,8729,false,3);
+    $crypto = NetworkStream::CRYPTO_OFF;
+    if($this->use_ssl) {
+      $crypto = NetworkStream::CRYPTO_TLS;
+    }
+
+    $this->ros = new RouterOS\Client($this->hostname,$this->username,$this->password,$this->port,false,3, $crypto);
   }
-  
+
   public function get($table, $filter = array()) {
     if(!$this->ros) $this->_connect();