Is there a moratorium on merging new features?



  • I submitted a pull request for the RFC 4638 patch in mid October and there has been little indication so far on the prospects of it being merged. I've just spent a fair bit of time fixing a conflict with a recent change to master - the intent behind the conflicting change was clear, but it happened to touch an area of code that had undergone significant modifications in the feature branch.

    I appreciate that there is currently a concerted effort to get 2.3 to beta state. If there is currently a moratorium on merging new features, please will the pfSense team say so and commit to giving a clear statement when this moratorium is lifted. It is a waste of time for contributors to keep feature branches in a mergeable state by fixing conflicts until there is a reasonable prospect of the feature being merged.

    To be clear, I acknowledge that the pfSense team have an absolute right to determine development priorities and to decide whether or not a feature is merged. I simply ask for clarity on the prospects of new features being merged at this time.



  • That's still on my list to finish testing, still hoping to get to it today. Once we hit beta, which is probably in a couple days, no more features or significant changes.



  • Thanks for the helpful clarification, Chris. It's just that it would have been a waste of time had I kept updating the feature branch as conflicts arose if there was no chance of a merge taking place in the near future. Equally, it would have been a waste of your precious QA resources for changes to be tested when the code in question was subsequently reworked by a merged pull request.



  • Renato got the latest mpd port up. That should be the last binary piece, will check out the PHP parts soon.

    David, if you wouldn't mind checking out the latest mpd port available on 2.3, v5.7_5, I'd appreciate it. I don't have a real world connection to test with, can fake it, but would like confirmation from someone with a real world scenario too.



  • @cmb:

    David, if you wouldn't mind checking out the latest mpd port available on 2.3, v5.7_5, I'd appreciate it. I don't have a real world connection to test with, can fake it, but would like confirmation from someone with a real world scenario too.

    I've just updated my 2.3 VM with the latest packages, including mpd5 5.7_5, and then installed the RFC 4638 patch (https://patch-diff.githubusercontent.com/raw/pfsense/pfsense/pull/1959.diff with path strip count 2 and base directory /). I successfully obtained a connection with MTU 1500:

    Dec 31 20:00:02 pfsense-test ppp: Multi-link PPP daemon for FreeBSD
    Dec 31 20:00:02 pfsense-test ppp:  
    Dec 31 20:00:02 pfsense-test ppp: process 73658 started, version 5.7 (root@pfSense_master_amd64_amd64-pfSense_master-job-01 19:14 31
    -Dec-2015)
    Dec 31 20:00:02 pfsense-test ppp: web: web is not running
    Dec 31 20:00:02 pfsense-test ppp: [opt2] Bundle: Interface ng0 created
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0] Link: OPEN event
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0] LCP: Open event
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0] LCP: state change Initial --> Starting
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0] LCP: LayerStart
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0] PPPoE: Set PPP-Max-Payload to '1500'
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0] PPPoE: Connecting to ''
    Dec 31 20:00:02 pfsense-test ppp: PPPoE: rec'd ACNAME "dsl7.th-lon"
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0] PPPoE: rec'd PPP-Max-Payload '1500'
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0] PPPoE: connection successful
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0] Link: UP event
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0] LCP: Up event
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0] LCP: state change Starting --> Req-Sent
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0] LCP: SendConfigReq #1
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0]   MRU 1500
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0]   MAGICNUM 4be5ee96
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0] LCP: rec'd Configure Request #189 (Req-Sent)
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0]   MRU 1500
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0]   AUTHPROTO CHAP MD5
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0]   MAGICNUM 500a5651
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0] LCP: SendConfigAck #189
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0]   MRU 1500
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0]   AUTHPROTO CHAP MD5
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0]   MAGICNUM 500a5651
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0] LCP: state change Req-Sent --> Ack-Sent
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0] LCP: rec'd Configure Ack #1 (Ack-Sent)
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0]   MRU 1500
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0]   MAGICNUM 4be5ee96
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0] LCP: state change Ack-Sent --> Opened
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0] LCP: auth: peer wants CHAP, I want nothing
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0] LCP: LayerUp
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0] CHAP: rec'd CHALLENGE #1 len: 32
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0]   Name: "dsl7.th-lon"
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0] CHAP: Using authname "zenXXXXX@zen"
    Dec 31 20:00:02 pfsense-test ppp: [opt2_link0] CHAP: sending RESPONSE #1 len: 33
    Dec 31 20:00:03 pfsense-test ppp: [opt2_link0] CHAP: rec'd SUCCESS #1 len: 41
    Dec 31 20:00:03 pfsense-test ppp: [opt2_link0]   MESG: CHAP authentication success, unit 623
    Dec 31 20:00:03 pfsense-test ppp: [opt2_link0] LCP: authorization successful
    Dec 31 20:00:03 pfsense-test ppp: [opt2_link0] Link: Matched action 'bundle "opt2" ""'
    Dec 31 20:00:03 pfsense-test ppp: [opt2_link0] Link: Join bundle "opt2"
    Dec 31 20:00:03 pfsense-test ppp: [opt2] Bundle: Status update: up 1 link, total bandwidth 64000 bps
    Dec 31 20:00:03 pfsense-test ppp: [opt2] IPCP: Open event
    Dec 31 20:00:03 pfsense-test ppp: [opt2] IPCP: state change Initial --> Starting
    Dec 31 20:00:03 pfsense-test ppp: [opt2] IPCP: LayerStart
    Dec 31 20:00:03 pfsense-test ppp: [opt2] IPV6CP: Open event
    Dec 31 20:00:03 pfsense-test ppp: [opt2] IPV6CP: state change Initial --> Starting
    Dec 31 20:00:03 pfsense-test ppp: [opt2] IPV6CP: LayerStart
    Dec 31 20:00:03 pfsense-test ppp: [opt2] IPCP: Up event
    Dec 31 20:00:03 pfsense-test ppp: [opt2] IPCP: state change Starting --> Req-Sent
    Dec 31 20:00:03 pfsense-test ppp: [opt2] IPCP: SendConfigReq #1
    Dec 31 20:00:03 pfsense-test ppp: [opt2]   IPADDR 0.0.0.0
    Dec 31 20:00:03 pfsense-test ppp: [opt2] IPV6CP: Up event
    Dec 31 20:00:03 pfsense-test ppp: [opt2] IPV6CP: state change Starting --> Req-Sent
    Dec 31 20:00:03 pfsense-test ppp: [opt2] IPV6CP: SendConfigReq #1
    Dec 31 20:00:03 pfsense-test ppp: [opt2] IPCP: rec'd Configure Request #85 (Req-Sent)
    Dec 31 20:00:03 pfsense-test ppp: [opt2]   IPADDR 62.3.84.27
    Dec 31 20:00:03 pfsense-test ppp: [opt2]     62.3.84.27 is OK
    Dec 31 20:00:03 pfsense-test ppp: [opt2] IPCP: SendConfigAck #85
    Dec 31 20:00:03 pfsense-test ppp: [opt2]   IPADDR 62.3.84.27
    Dec 31 20:00:03 pfsense-test ppp: [opt2] IPCP: state change Req-Sent --> Ack-Sent
    Dec 31 20:00:03 pfsense-test ppp: [opt2] IPCP: rec'd Configure Nak #1 (Ack-Sent)
    Dec 31 20:00:03 pfsense-test ppp: [opt2]   IPADDR a.b.c.d
    Dec 31 20:00:03 pfsense-test ppp: [opt2]     a.b.c.d is OK
    Dec 31 20:00:03 pfsense-test ppp: [opt2] IPCP: SendConfigReq #2
    Dec 31 20:00:03 pfsense-test ppp: [opt2]   IPADDR a.b.c.d
    Dec 31 20:00:03 pfsense-test ppp: [opt2] IPV6CP: rec'd Configure Request #138 (Req-Sent)
    Dec 31 20:00:03 pfsense-test ppp: [opt2] IPV6CP: SendConfigAck #138
    Dec 31 20:00:03 pfsense-test ppp: [opt2] IPV6CP: state change Req-Sent --> Ack-Sent
    Dec 31 20:00:03 pfsense-test ppp: [opt2] IPV6CP: rec'd Configure Ack #1 (Ack-Sent)
    Dec 31 20:00:03 pfsense-test ppp: [opt2] IPV6CP: state change Ack-Sent --> Opened
    Dec 31 20:00:03 pfsense-test ppp: [opt2] IPV6CP: LayerUp
    Dec 31 20:00:03 pfsense-test ppp: [opt2]   0a00:27ff:fec5:d87f -> 0230:88ff:fe16:5eff
    Dec 31 20:00:03 pfsense-test ppp: [opt2] IFACE: Up event
    Dec 31 20:00:03 pfsense-test ppp: [opt2] IFACE: Rename interface ng0 to pppoe
    Dec 31 20:00:03 pfsense-test ppp: [opt2] IPCP: rec'd Configure Ack #2 (Ack-Sent)
    Dec 31 20:00:03 pfsense-test ppp: [opt2]   IPADDR a.b.c.d
    Dec 31 20:00:03 pfsense-test ppp: [opt2] IPCP: state change Ack-Sent --> Opened
    Dec 31 20:00:03 pfsense-test ppp: [opt2] IPCP: LayerUp
    Dec 31 20:00:03 pfsense-test ppp: [opt2]   a.b.c.d -> 62.3.84.27
    

    I've masked the ACNAME (as I believe it identifies my circuit), my ISP user name and my local IP address, otherwise this log is verbatim.


  • Developer Netgate Administrator

    Pull request has been merged, thanks for all the work David!



  • Thanks to everyone for getting the RFC 4638 functionality merged.

    I have at least one more pull request close to being submitted, but I'm talking about bug fixes to existing features with <20 lines of code.


  • Netgate

    That should be fine, David_W.


Log in to reply