commit c298a8c8b1a0762e5f5bee5f3d28039d2dcce8a4
author Zesstra <zesstra@zesstra.de> Thu Sep 26 21:02:53 2019 +0200
committer Zesstra <zesstra@zesstra.de> Mon Nov 25 19:31:43 2019 +0100
tree dcb201ea41f88d753421b1c2d995e1335e56b142
parent e4cdb81b52df0317b15ad006b2861bbdace0737f

binary_message braucht 'bytes'

Anpassung an LDMud-3.6.x

Change-Id: Icf3a14902cfe63e753349d4a496edc87a9f83be0

secure/telnetneg.c

diff --git a/secure/telnetneg.c b/secure/telnetneg.c
index 6a7a356..5760169 100644
--- a/secure/telnetneg.c
+++ b/secure/telnetneg.c
@@ -134,7 +134,7 @@
     return efun::binary_message(arr, bm_flags);
 }
 
-protected varargs int send_telnet_neg_str(string str, int bm_flags) {
+protected varargs int send_telnet_neg_str(bytes str, int bm_flags) {
 #ifdef __DEBUG__
     // Debugausgaben zur Zeit nur fuer arraybasierte Variante
     return send_telnet_neg(to_array(str), bm_flags);
@@ -148,16 +148,16 @@
     case DO:
     case DONT:
         (opt->lo_wishes)->remoteside = str[0];
-        str=sprintf("%c%s",IAC,str);
+        str=to_bytes(sprintf("%c%s",IAC,str), "ASCII");
         break;
     case WILL:
     case WONT:
         (opt->lo_wishes)->localside = str[0];
-        str=sprintf("%c%s",IAC,str);
+        str=to_bytes(sprintf("%c%s",IAC,str), "ASCII");
         break;
     case SB:
-        (opt->lo_wishes)->sbdata = map(explode(str[0..],""),#'to_int);
-        str=sprintf("%c%s%c%c", IAC, str, IAC, SE);
+        (opt->lo_wishes)->sbdata = map(explode(str[0..],""), #'to_int);
+        str=to_bytes(sprintf("%c%s%c%c", IAC, str, IAC, SE), "ASCII");
         break;
     default:
         break;
@@ -244,8 +244,8 @@
     send_telnet_neg( ({WONT, TELOPT_MSSP }) );
   else
   {
-    send_telnet_neg_str(sprintf("%c%c%s",
-          SB, TELOPT_MSSP, mssp->get_telnegs_str()));
+    send_telnet_neg_str(to_bytes(sprintf("%c%c%s",
+          SB, TELOPT_MSSP, mssp->get_telnegs_str()), "ASCII"));
     // die Daten brauchen wir nicht mehr
     opt->lo_wishes->sbdata = 0;
   }