1649678 - FTBFS in nICEr/src/stun/addrs-bsd.c on OpenBSD

Status: RESOLVED FIXED

(Core :: WebRTC: Networking, defect, P2)

Description

[Landry Breuil (:gaston)]

79.0b1 fails hard with:

/usr/obj/ports/firefox-79.0beta1/firefox-79.0/media/mtransport/third_party/nICEr/src/stun/addrs-bsd.c:36:20: error: variable has incomplete type 'struct in6_ifreq'
  struct in6_ifreq ifr6;
                   ^
/usr/obj/ports/firefox-79.0beta1/firefox-79.0/media/mtransport/third_party/nICEr/src/stun/addrs-bsd.c:36:10: note: forward declaration of 'struct in6_ifreq'
  struct in6_ifreq ifr6;
         ^
/usr/obj/ports/firefox-79.0beta1/firefox-79.0/media/mtransport/third_party/nICEr/src/stun/addrs-bsd.c:42:16: error: use of undeclared identifier 'SIOCGIFAFLAG_IN6'
  if (ioctl(s, SIOCGIFAFLAG_IN6, &ifr6) != -1) {
               ^
/usr/obj/ports/firefox-79.0beta1/firefox-79.0/media/mtransport/third_party/nICEr/src/stun/addrs-bsd.c:54:19: error: use of undeclared identifier 'IN6_IFF_ANYCAST'
  return flags & (IN6_IFF_ANYCAST | IN6_IFF_TENTATIVE | IN6_IFF_DUPLICATED | IN6_IFF_DETACHED | IN6_IFF_DEPRECATED);
                  ^
/usr/obj/ports/firefox-79.0beta1/firefox-79.0/media/mtransport/third_party/nICEr/src/stun/addrs-bsd.c:54:37: error: use of undeclared identifier 'IN6_IFF_TENTATIVE'
  return flags & (IN6_IFF_ANYCAST | IN6_IFF_TENTATIVE | IN6_IFF_DUPLICATED | IN6_IFF_DETACHED | IN6_IFF_DEPRECATED);
                                    ^
/usr/obj/ports/firefox-79.0beta1/firefox-79.0/media/mtransport/third_party/nICEr/src/stun/addrs-bsd.c:54:57: error: use of undeclared identifier 'IN6_IFF_DUPLICATED'
  return flags & (IN6_IFF_ANYCAST | IN6_IFF_TENTATIVE | IN6_IFF_DUPLICATED | IN6_IFF_DETACHED | IN6_IFF_DEPRECATED);
                                                        ^
/usr/obj/ports/firefox-79.0beta1/firefox-79.0/media/mtransport/third_party/nICEr/src/stun/addrs-bsd.c:54:78: error: use of undeclared identifier 'IN6_IFF_DETACHED'
  return flags & (IN6_IFF_ANYCAST | IN6_IFF_TENTATIVE | IN6_IFF_DUPLICATED | IN6_IFF_DETACHED | IN6_IFF_DEPRECATED);
                                                                             ^
/usr/obj/ports/firefox-79.0beta1/firefox-79.0/media/mtransport/third_party/nICEr/src/stun/addrs-bsd.c:54:97: error: use of undeclared identifier 'IN6_IFF_DEPRECATED'
  return flags & (IN6_IFF_ANYCAST | IN6_IFF_TENTATIVE | IN6_IFF_DUPLICATED | IN6_IFF_DETACHED | IN6_IFF_DEPRECATED);
                                                                                                ^
/usr/obj/ports/firefox-79.0beta1/firefox-79.0/media/mtransport/third_party/nICEr/src/stun/addrs-bsd.c:86:27: error: use of undeclared identifier 'IN6_IFF_TEMPORARY'
              if (flags & IN6_IFF_TEMPORARY) {

seems all those defines/structs are only in netinet6/in6_var.h, which is only included by net/if_sppp.h on OpenBSD. Not sure those are supposed to be public ?

trying the obvious by including netinet6/in6_var.h below netinet/in.h in addrs-bsd.c.

Comment 1

[Landry Breuil (:gaston)]

adding that #include leaves only one missing define for IN6_IFF_TEMPORARY which isnt defined on OpenBSD.

/usr/obj/ports/firefox-79.0beta1/firefox-79.0/media/mtransport/third_party/nICEr/src/stun/addrs-bsd.c:87:27: error: use
 of undeclared identifier 'IN6_IFF_TEMPORARY'
              if (flags & IN6_IFF_TEMPORARY) {
                          ^
1 error generated.

Comment 2

[Landry Breuil (:gaston)]

In the meantime, internal discussions on OpenBSD developers list agree that we should add a #define for IN6_IFF_TEMPORARY as an alias for IN6_IFF_PRIVACY, which is the same concept - per https://github.com/openbsd/src/blob/master/sys/netinet6/in6_var.h#L294.

So to properly fix this issue, only the inclusing of <netinet6/in6_var.h> seems required on the mozilla side.

Comment 3

[BugBot [:suhaib / :marco/ :calixte]]

Set release status flags based on info from the regressing bug 1183145

Comment 4

[Jan-Ivar Bruaroey [:jib] (needinfo? me)]

Byron, any thoughts?

Comment 5

[Landry Breuil (:gaston)]

In the meantime, IN6_IFF_PRIVACY was renamed to IN6_IFF_TEMPORARY in OpenBSD: https://marc.info/?l=openbsd-cvs&m=159379818808143&w=2

Comment 6

[Landry Breuil (:gaston)]

And i've locally patched it with https://cgit.rhaalovely.net/mozilla-firefox/commit/?h=beta&id=03d435d6a01deb29ce6b080ab3a72188e923962d, adding the missing include.

Comment 7

[Byron Campen [:bwc]]

I'll take care of this.

Comment 8

[Byron Campen [:bwc]]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=2b9120efc6126a98b73d09908942c13a55b25075

Comment 9

[Byron Campen [:bwc]]

Attachment: Bug 1649678: Add include needed by OpenBSD. r?mjf

Comment 10

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/76b3c77b815d
Add include needed by OpenBSD. r=mjf

Comment 11

[Atila Butkovits]

https://hg.mozilla.org/mozilla-central/rev/76b3c77b815d

Comment 12

[BugBot [:suhaib / :marco/ :calixte]]

The patch landed in nightly and beta is affected.
:bwc, is this bug important enough to require an uplift?
If not please set status_beta to wontfix.

For more information, please visit auto_nag documentation.

Comment 13

[Byron Campen [:bwc]]

Yeah, this is a really simple change.

Comment 14

[Byron Campen [:bwc]]

Comment on attachment 9161880 [details]
Bug 1649678: Add include needed by OpenBSD. r?mjf

Beta/Release Uplift Approval Request

• User impact if declined: Build failures on OpenBSD.
• Is this code covered by automated tests?: Yes
• Has the fix been verified in Nightly?: Yes
• Needs manual test from QE?: No
• If yes, steps to reproduce:
• List of other uplifts needed: None
• Risk to taking this patch: Low
• Why is the change risky/not risky? (and alternatives if risky): Just adding an include. Pretty safe.
• String changes made/needed: None.

Comment 15

[Ryan VanderMeulen [:RyanVM]]

Comment on attachment 9161880 [details]
Bug 1649678: Add include needed by OpenBSD. r?mjf

Approved for 79.0b7.

Comment 16

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/releases/mozilla-beta/rev/64705a0bc68f