making it more flexible for future additions

Author: devnexen

ext/sockets/sockets.c

@@ -1964,20 +1964,30 @@ PHP_FUNCTION(socket_set_option)
 #ifdef SO_ATTACH_REUSEPORT_CBPF
 		case SO_ATTACH_REUSEPORT_CBPF: {
 			convert_to_long(arg4);
+
 			if (!Z_LVAL_P(arg4)) {
 				ov = 1;
 				optlen = sizeof(ov);
 				opt_ptr = &ov;
 				optname = SO_DETACH_BPF;
 			} else {
-				static struct sock_filter cbpf[] = {
-					BPF_STMT((BPF_LD|BPF_W|BPF_ABS), (uint32_t)(SKF_AD_OFF+SKF_AD_CPU)),
-					BPF_STMT((BPF_RET|BPF_A), 0),
-				};
-				static struct sock_fprog bpfprog = {
-					.len = (sizeof(cbpf) / sizeof(cbpf[0])),
-					.filter = cbpf,
-				};
+                uint32_t k = (uint32_t)Z_LVAL_P(arg4);
+                static struct sock_filter cbpf[8] = {0};
+                static struct sock_fprog bpfprog;
+
+                switch (k) {
+                case SKF_AD_CPU:
+					cbpf[0].code = (BPF_LD|BPF_W|BPF_ABS);
+                    cbpf[0].k = (uint32_t)(SKF_AD_OFF + k);
+					cbpf[1].code = (BPF_RET|BPF_A);
+                    bpfprog.len = 2;
+                    break;
+                default:
+                    php_error_docref(NULL, E_WARNING, "Unsupported CBPF filter");
+                    RETURN_FALSE;
+                }
+
+                bpfprog.filter = cbpf;
 				optlen = sizeof(bpfprog);
 				opt_ptr = &bpfprog;
 			}

ext/sockets/tests/socket_reuseport_cbpf.phpt

@@ -18,7 +18,7 @@ if (!$socket) {
 }
 var_dump(socket_set_option( $socket, SOL_SOCKET, SO_REUSEADDR, true));
 var_dump(socket_set_option( $socket, SOL_SOCKET, SO_REUSEPORT, true));
-var_dump(socket_set_option( $socket, SOL_SOCKET, SO_ATTACH_REUSEPORT_CBPF, true));
+var_dump(socket_set_option( $socket, SOL_SOCKET, SO_ATTACH_REUSEPORT_CBPF, SKF_AD_CPU));
 var_dump(socket_bind($socket, '0.0.0.0'));
 socket_listen($socket);
 socket_close($socket);