Update settings.conf

config/opencomputers/settings.conf

@@ -631,26 +631,14 @@ opencomputers {
   # Internet settings, security related.
   internet {
 
-    # This is a list of blacklisted domain names. If an HTTP request is made
-    # or a socket connection is opened the target address will be compared
-    # to the addresses / adress ranges in this list. It it is present in this
-    # list, the request will be denied.
-    # Entries are either domain names (www.example.com) or IP addresses in
-    # string format (10.0.0.3), optionally in CIDR notation to make it easier
-    # to define address ranges (1.0.0.0/8). Domains are resolved to their
-    # actual IP once on startup, future requests are resolved and compared
-    # to the resolved addresses.
-    # By default all local addresses are blocked. This is only meant as a
-    # thin layer of security, to avoid average users hosting a game on their
-    # local machine having players access services in their local network.
-    # Server hosters are expected to configure their network outside of the
-    # mod's context in an appropriate manner, e.g. using a system firewall.
-    blacklist=[
-      "127.0.0.0/8",
-      "10.0.0.0/8",
-      "192.168.0.0/16",
-      "172.16.0.0/12"
-    ]
+    # No longer used! See internet.filteringRules.
+    # 
+    # Previous contents:
+    # "127.0.0.0/8"
+    # "10.0.0.0/8"
+    # "192.168.0.0/16"
+    # "172.16.0.0/12"
+    blacklist=[]
 
     # Whether to allow HTTP requests via internet cards. When enabled,
     # the `request` method on internet card components becomes available.
@@ -671,6 +659,48 @@ opencomputers {
     # the `connect` method on internet card components becomes available.
     enableTcp=true
 
+    # This is a list of filtering rules. For any HTTP request or TCP socket
+    # connection, the target address will be processed by each rule, starting
+    # from first to last. The first matching rule will be applied; if no rule
+    # contains a match, the request will be denied.
+    # Two types of rules are currently supported: "allow", which allows an
+    # address to be accessed, and "deny", which forbids such access.
+    # Rules can be suffixed with additional filters to limit their scope:
+    # - all: apply to all addresses
+    # - default: apply built-in allow/deny rules; these may not be up to date,
+    #   so one should primarily rely on them as a fallback
+    # - private: apply to all private addresses
+    # - bogon: apply to all known bogon addresses
+    # - ipv4: apply to all IPv4 addresses
+    # - ipv6: apply to all IPv6 addresses
+    # - ipv4-embedded-ipv6: apply to all IPv4 addresses embedded in IPv6
+    #   addresses
+    # - ip:[address]: apply to this IP address in string format (10.0.0.3).
+    #   CIDR notation is supported and allows defining address ranges
+    #   (1.0.0.0/8).
+    # - domain:[domain]: apply to this domain. Domains are resolved to their
+    #   actual IP only once (on startup), future requests are resolved and
+    #   compared to the resolved addresses. Wildcards are not supported.
+    # The "removeme" rule does not have any use, but is instead present to
+    # detect whether to emit a warning on dedicated server configurations.
+    # Modpack authors are asked not to remove this rule; server administrators
+    # are free to remove it once the filtering rules have been adjusted.
+    # By default all private addresses are blocked. This is only meant as a
+    # thin layer of security, to avoid average users hosting a game on their
+    # local machine having players access services in their local network.
+    # Server hosters are expected to configure their network outside of the
+    # mod's context in an appropriate manner, e.g. using a system firewall.
+    filteringRules=[
+      "deny ip:127.0.0.0/8",
+      "deny ip:10.0.0.0/8",
+      "deny ip:192.168.0.0/16",
+      "deny ip:172.16.0.0/12",
+      removeme,
+      "deny private",
+      "deny bogon",
+      "allow default"
+    ]
+
     # The maximum concurrent TCP connections *each* internet card can have
     # open at a time.
     maxTcpConnections=4
@@ -686,13 +716,9 @@ opencomputers {
     # they are to delay each other.
     threads=4
 
-    # This is a list of whitelisted domain names. Requests may only be made
-    # to addresses that are present in this list. If this list is empty,
-    # requests may be made to all addresses not blacklisted. Note that the
-    # blacklist is always applied, so if an entry is present in both the
-    # whitelist and the blacklist, the blacklist will win.
-    # Entries are of the same format as in the blacklist. Examples:
-    # "gist.github.com", "www.pastebin.com"
+    # No longer used! See internet.filteringRules.
+    # 
+    # Previous contents:
     whitelist=[]
   }
 
@@ -741,6 +767,10 @@ opencomputers {
       "minecraft:fire"
     ]
 
+    # Delay between disk activity sounds, specified in milliseconds.
+    # If set to -1, no disk activity update packets are sent.
+    diskActivitySoundDelay=500
+
     # Controls how noisy results from the Geolyzer are. This is the maximum
     # deviation from the original value at the maximum vertical distance
     # from the geolyzer. Noise increases linearly with the vertical distance
@@ -783,6 +813,19 @@ opencomputers {
     # string from the clipboard (Shift+Ins on a screen with a keyboard).
     maxClipboard=1024
 
+    # Maximum distance for visual effects sent from the client to the server.
+    # These are non-essential - losing them should not cause glitches on the client side.
+    maxNetworkClientEffectPacketDistance=64
+
+    # Maximum distance for updates sent from the client to the server, in blocks.
+    # This is further modulated by the server's maximum view distance.
+    # If set to 0, this option is ignored.
+    maxNetworkClientPacketDistance=0
+
+    # Maximum distance for sound effects sent from the client to the server.
+    # These are non-essential - losing them should not cause glitches on the client side.
+    maxNetworkClientSoundPacketDistance=32
+
     # The maximum number of "data parts" a network packet is allowed to have.
     # When sending a network message, from Lua this may look like so:
     #  component.modem.broadcast(port, "first", true, "third", 123)
@@ -1692,6 +1735,6 @@ opencomputers {
   # The version of OC this config was generated by. This is used to allow the
   # mod to reset parts of the config when their meaning changed across
   # versions, so that the user does not have to delete it.
-  version="1.8.1"
+  version="1.8.3"
 
 }