bug-gnu-emacs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#38937: [PROPOSED PATCH] dns-query now represents SOA integers as int


From: Paul Eggert
Subject: bug#38937: [PROPOSED PATCH] dns-query now represents SOA integers as integers
Date: Sat, 4 Jan 2020 19:05:57 -0800

* etc/NEWS: Mention this.
* lisp/net/dns.el (dns-read-int32): Declare obsolete.
Assume bignums.
(dns-read-type): Represent SOA integers as integers, not strings.
---
 etc/NEWS        |  5 +++++
 lisp/net/dns.el | 16 +++++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index d6cabf8e9e..204f6692bb 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -42,6 +42,11 @@ applies, and please also update docstrings as needed.
 
 * Incompatible Lisp Changes in Emacs 28.1
 
+** dns-query now consistently uses Lisp integers to represent integers.
+Formerly it made an exception for integer components of SOA records,
+because SOA serial numbers can exceed fixnum ranges on 32-bit platforms.
+Emacs now supports bignums so this old glitch is no longer needed.
+
 
 * Lisp Changes in Emacs 28.1
 
diff --git a/lisp/net/dns.el b/lisp/net/dns.el
index cefe0851f0..8fb1eb6567 100644
--- a/lisp/net/dns.el
+++ b/lisp/net/dns.el
@@ -258,10 +258,8 @@ dns-read
       (nreverse spec))))
 
 (defun dns-read-int32 ()
-  ;; Full 32 bit Integers can't be handled by 32-bit Emacsen.  If we
-  ;; use floats, it works.
-  (format "%.0f" (+ (* (dns-read-bytes 1) 16777216.0)
-                   (dns-read-bytes 3))))
+  (declare (obsolete nil "28.1"))
+  (number-to-string (dns-read-bytes 4)))
 
 (defun dns-read-type (string type)
   (let ((buffer (current-buffer))
@@ -286,11 +284,11 @@ dns-read-type
            ((eq type 'SOA)
             (list (list 'mname (dns-read-name buffer))
                   (list 'rname (dns-read-name buffer))
-                  (list 'serial (dns-read-int32))
-                  (list 'refresh (dns-read-int32))
-                  (list 'retry (dns-read-int32))
-                  (list 'expire (dns-read-int32))
-                  (list 'minimum (dns-read-int32))))
+                  (list 'serial (dns-read-bytes 4))
+                  (list 'refresh (dns-read-bytes 4))
+                  (list 'retry (dns-read-bytes 4))
+                  (list 'expire (dns-read-bytes 4))
+                  (list 'minimum (dns-read-bytes 4))))
            ((eq type 'SRV)
             (list (list 'priority (dns-read-bytes 2))
                   (list 'weight (dns-read-bytes 2))
-- 
2.17.1






reply via email to

[Prev in Thread] Current Thread [Next in Thread]